Corrected _setCallbackInfo code so GiveFeedback can work

[wxWidgets.git] / wxPython / contrib / ogl / mac / ogl_wrap.cpp

diff --git a/wxPython/contrib/ogl/mac/ogl_wrap.cpp b/wxPython/contrib/ogl/mac/ogl_wrap.cpp
index 5d654d77cd842b606ec9ffd9bc0a54cdfd875575..3e3e4fcfaa7d01e7b05626bed4c2b62603ec4903 100644 (file)
--- a/wxPython/contrib/ogl/mac/ogl_wrap.cpp
+++ b/wxPython/contrib/ogl/mac/ogl_wrap.cpp
@@ -312,17 +312,15 @@ static swig_type_info *swig_types[42];
 SWIGSTATICINLINE(double)
 SWIG_AsDouble(PyObject *obj)
 {
-  double val = (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) :
-#if HAVE_LONG_LONG
-    ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj));
-#else
-    ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj));
-#endif
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "a double is expected");
-  }
-  return val;
+    if (PyNumber_Check(obj))
+        return PyFloat_AsDouble(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
 }
 
 
@@ -369,7 +367,15 @@ SWIG_CheckLongInRange(long value, const char* type,
 SWIGSTATICINLINE(long)
 SWIG_AsLong(PyObject * obj)
 {
-  return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(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;
+    }
 }
 
 
@@ -599,7 +605,7 @@ PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){
             wxObject*   wxObj;
             wxNode*     node = list->GetFirst();
 
-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();
             pyList = PyList_New(0);
             while (node) {
                 wxObj = node->GetData();
@@ -607,7 +613,7 @@ PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){
                 PyList_Append(pyList, pyObj);
                 node = node->GetNext();
             }
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
             return pyList;
         }
 PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
@@ -617,7 +623,7 @@ PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
             wxObject*   wxObj;
             wxNode*     node = list->GetFirst();
 
-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();
             pyList = PyList_New(0);
             while (node) {
                 wxObj = node->GetData();
@@ -625,7 +631,7 @@ PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
                 PyList_Append(pyList, pyObj);
                 node = node->GetNext();
             }
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
             return pyList;
         }
 
@@ -656,17 +662,17 @@ PyObject *wxDiagram_GetShapeList(wxDiagram *self){
 // work for any class for the VERY generic cases, but beyond that the helper
 // needs to know more about the type.
 wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();
     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
     for (int x=0; x<count; x++) {
@@ -677,29 +683,29 @@ wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
             wxString errmsg;
             errmsg.Printf(wxT("Type error, expected list of %s objects"), className);
             PyErr_SetString(PyExc_TypeError, errmsg.mb_str());
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
             return NULL;
         }
         list->Append(wxo);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return list;
 }
 
 //---------------------------------------------------------------------------
 
 wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();
     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
     for (int x=0; x<count; x++) {
@@ -718,13 +724,13 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
             wxRealPoint* wxo = NULL;
             if (wxPyConvertSwigPtr(pyo, (void **)&wxo, wxT("wxRealPoint"))) {
                 PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
-                wxPyEndBlockThreads();
+                wxPyEndBlockThreads(blocked);
                 return NULL;
             }
             list->Append((wxObject*) new wxRealPoint(*wxo));
         }
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return list;
 }
 
@@ -761,7 +767,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
     wxObject*   wxObj;
     wxNode*     node = list->GetFirst();
 
-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();
     pyList = PyList_New(0);
     while (node) {
         wxObj = node->GetData();
@@ -769,7 +775,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
         PyList_Append(pyList, pyObj);
         node = node->GetNext();
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return pyList;
 }
 
@@ -802,7 +808,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyTextShape, wxTextShape);
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_new_ShapeRegion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ShapeRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *result;
     char *kwnames[] = {
@@ -824,7 +830,7 @@ static PyObject *_wrap_new_ShapeRegion(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
@@ -865,7 +871,7 @@ static PyObject *_wrap_ShapeRegion_SetText(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -914,7 +920,7 @@ static PyObject *_wrap_ShapeRegion_SetFont(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -947,7 +953,7 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -980,7 +986,7 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -1013,7 +1019,7 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -1046,7 +1052,7 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int arg2 ;
@@ -1075,7 +1081,7 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
@@ -1116,7 +1122,7 @@ static PyObject *_wrap_ShapeRegion_SetName(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
@@ -1157,7 +1163,7 @@ static PyObject *_wrap_ShapeRegion_SetColour(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1189,7 +1195,7 @@ static PyObject *_wrap_ShapeRegion_GetText(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxFont *result;
@@ -1215,7 +1221,7 @@ static PyObject *_wrap_ShapeRegion_GetFont(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -1254,7 +1260,7 @@ static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -1293,7 +1299,7 @@ static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -1332,7 +1338,7 @@ static PyObject *_wrap_ShapeRegion_GetSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -1371,7 +1377,7 @@ static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int result;
@@ -1397,7 +1403,7 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1429,7 +1435,7 @@ static PyObject *_wrap_ShapeRegion_GetName(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1461,7 +1467,7 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxColour result;
@@ -1491,7 +1497,7 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxList *result;
@@ -1520,7 +1526,7 @@ static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1552,7 +1558,7 @@ static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int result;
@@ -1578,7 +1584,7 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int arg2 ;
@@ -1607,7 +1613,7 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
@@ -1648,7 +1654,7 @@ static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxPen *result;
@@ -1674,7 +1680,7 @@ static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double result;
@@ -1700,7 +1706,7 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double result;
@@ -1726,7 +1732,7 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ShapeRegion_ClearText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_ClearText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1751,14 +1757,14 @@ static PyObject *_wrap_ShapeRegion_ClearText(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject * ShapeRegion_swigregister(PyObject *, PyObject *args) {
+static PyObject * ShapeRegion_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     double arg2 = (double) 0.0 ;
@@ -1798,7 +1804,7 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     int arg2 ;
@@ -1822,7 +1828,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     int result;
@@ -1843,7 +1849,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double arg2 ;
@@ -1867,7 +1873,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double result;
@@ -1888,7 +1894,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double arg2 ;
@@ -1912,7 +1918,7 @@ static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double result;
@@ -1933,14 +1939,14 @@ static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject * AttachmentPoint_swigregister(PyObject *, PyObject *args) {
+static PyObject * AttachmentPoint_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) NULL ;
     wxPyShape *arg2 = (wxPyShape *) NULL ;
@@ -1976,7 +1982,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2007,7 +2013,7 @@ static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2035,7 +2041,7 @@ static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -2064,7 +2070,7 @@ static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShape *result;
@@ -2092,7 +2098,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *arg2 = (wxPyShapeEvtHandler *) 0 ;
@@ -2121,7 +2127,7 @@ static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -2149,7 +2155,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -2177,7 +2183,7 @@ static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2202,7 +2208,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2236,7 +2242,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2270,7 +2276,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2310,7 +2316,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2344,7 +2350,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2378,7 +2384,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2412,7 +2418,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2446,7 +2452,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2491,7 +2497,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2536,7 +2542,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2581,7 +2587,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2614,7 +2620,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2664,14 +2670,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2727,7 +2735,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     bool arg2 ;
@@ -2776,7 +2784,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2821,7 +2829,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2866,7 +2874,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     bool arg2 ;
@@ -2915,7 +2923,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2960,7 +2968,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -3005,7 +3013,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3055,7 +3063,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3089,7 +3097,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *, Py
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3123,7 +3131,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *, P
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3163,7 +3171,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3216,7 +3224,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3265,7 +3273,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *,
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3314,7 +3322,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *, Py
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -3347,7 +3355,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -3380,14 +3388,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *, PyObject *ar
 }
 
 
-static PyObject * PyShapeEvtHandler_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyShapeEvtHandler_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) NULL ;
     wxPyShape *result;
@@ -3417,7 +3425,7 @@ static PyObject *_wrap_new_PyShape(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -3448,7 +3456,7 @@ static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -3487,7 +3495,7 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -3526,7 +3534,7 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3567,7 +3575,9 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         PyObject *o = PyFloat_FromDouble((double) (*arg6));
         resultobj = t_output_helper(resultobj,o);
@@ -3582,7 +3592,7 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *result;
@@ -3610,7 +3620,7 @@ static PyObject *_wrap_PyShape_GetCanvas(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_SetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3639,7 +3649,7 @@ static PyObject *_wrap_PyShape_SetCanvas(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_AddToCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddToCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3674,7 +3684,7 @@ static PyObject *_wrap_PyShape_AddToCanvas(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3703,7 +3713,7 @@ static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3732,7 +3742,7 @@ static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -3758,7 +3768,7 @@ static PyObject *_wrap_PyShape_GetX(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_PyShape_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -3784,7 +3794,7 @@ static PyObject *_wrap_PyShape_GetY(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_PyShape_SetX(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3813,7 +3823,7 @@ static PyObject *_wrap_PyShape_SetX(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_PyShape_SetY(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3842,7 +3852,7 @@ static PyObject *_wrap_PyShape_SetY(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_PyShape_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *result;
@@ -3870,7 +3880,7 @@ static PyObject *_wrap_PyShape_GetParent(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -3899,7 +3909,7 @@ static PyObject *_wrap_PyShape_SetParent(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *result;
@@ -3927,7 +3937,7 @@ static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -3953,7 +3963,7 @@ static PyObject *_wrap_PyShape_GetChildren(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_Unlink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Unlink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3978,7 +3988,7 @@ static PyObject *_wrap_PyShape_Unlink(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4007,7 +4017,7 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4026,14 +4036,16 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4058,7 +4070,7 @@ static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = (wxDC *) NULL ;
@@ -4089,7 +4101,7 @@ static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4114,7 +4126,7 @@ static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -4142,7 +4154,7 @@ static PyObject *_wrap_PyShape_GetEventHandler(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeEvtHandler *arg2 = (wxPyShapeEvtHandler *) 0 ;
@@ -4171,7 +4183,7 @@ static PyObject *_wrap_PyShape_SetEventHandler(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4196,7 +4208,7 @@ static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4221,7 +4233,7 @@ static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_Recompute(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4240,14 +4252,16 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4272,7 +4286,7 @@ static PyObject *_wrap_PyShape_CalculateSize(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_Select(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 = (bool) True ;
@@ -4309,7 +4323,7 @@ static PyObject *_wrap_PyShape_Select(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PyShape_SetHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 = (bool) True ;
@@ -4346,7 +4360,7 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_IsHighlighted(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4365,14 +4379,16 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_Selected(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4391,14 +4407,16 @@ static PyObject *_wrap_PyShape_Selected(PyObject *, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_AncestorSelected(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4417,14 +4435,16 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) OP_ALL ;
@@ -4461,7 +4481,7 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -4487,7 +4507,7 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_SetDraggable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4522,7 +4542,7 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetFixedSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4555,7 +4575,7 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool *arg2 = (bool *) 0 ;
@@ -4594,7 +4614,7 @@ static PyObject *_wrap_PyShape_GetFixedSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4613,14 +4633,16 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4639,14 +4661,16 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4675,7 +4699,7 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4694,14 +4718,16 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetShadowMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -4736,7 +4762,7 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_GetShadowMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -4762,7 +4788,7 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -4795,7 +4821,9 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         PyObject *o = PyInt_FromLong((long) (*arg4));
         resultobj = t_output_helper(resultobj,o);
@@ -4810,7 +4838,7 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyShape_SetCentreResize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4839,7 +4867,7 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_GetCentreResize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4858,14 +4886,16 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4894,7 +4924,7 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4913,14 +4943,16 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetLines(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetLines(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -4946,7 +4978,7 @@ static PyObject *_wrap_PyShape_GetLines(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4975,7 +5007,7 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4994,14 +5026,16 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -5030,7 +5064,7 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -5056,7 +5090,7 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long arg2 ;
@@ -5085,7 +5119,7 @@ static PyObject *_wrap_PyShape_SetId(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_PyShape_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long result;
@@ -5111,7 +5145,7 @@ static PyObject *_wrap_PyShape_GetId(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_PyShape_SetPen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -5156,7 +5190,7 @@ static PyObject *_wrap_PyShape_SetPen(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PyShape_SetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -5199,7 +5233,7 @@ static PyObject *_wrap_PyShape_SetBrush(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_Show(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -5228,7 +5262,7 @@ static PyObject *_wrap_PyShape_Show(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_PyShape_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -5247,14 +5281,16 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_Move(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5302,7 +5338,7 @@ static PyObject *_wrap_PyShape_Move(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_PyShape_Erase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Erase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5336,7 +5372,7 @@ static PyObject *_wrap_PyShape_Erase(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_PyShape_EraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_EraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5370,7 +5406,7 @@ static PyObject *_wrap_PyShape_EraseContents(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5404,7 +5440,7 @@ static PyObject *_wrap_PyShape_Draw(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_PyShape_Flash(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Flash(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5429,7 +5465,7 @@ static PyObject *_wrap_PyShape_Flash(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_PyShape_MoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5463,7 +5499,7 @@ static PyObject *_wrap_PyShape_MoveLinks(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_DrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5497,7 +5533,7 @@ static PyObject *_wrap_PyShape_DrawContents(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -5536,7 +5572,7 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -5569,7 +5605,7 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Attach(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -5598,7 +5634,7 @@ static PyObject *_wrap_PyShape_Attach(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PyShape_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5623,7 +5659,7 @@ static PyObject *_wrap_PyShape_Detach(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PyShape_Constrain(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -5642,14 +5678,16 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_AddLine(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -5706,7 +5744,7 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyShape_GetLinePosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -5736,7 +5774,7 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_AddText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -5777,7 +5815,7 @@ static PyObject *_wrap_PyShape_AddText(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyShape_GetPen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen *result;
@@ -5803,7 +5841,7 @@ static PyObject *_wrap_PyShape_GetPen(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PyShape_GetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush *result;
@@ -5829,7 +5867,7 @@ static PyObject *_wrap_PyShape_GetBrush(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5854,7 +5892,7 @@ static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_FormatText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5910,7 +5948,7 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_SetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -5945,7 +5983,7 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_GetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -5977,7 +6015,7 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -6032,7 +6070,7 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyShape_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6064,7 +6102,7 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyShape_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -6111,7 +6149,7 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6149,7 +6187,7 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -6175,7 +6213,7 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_SetRegionName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -6222,7 +6260,7 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_GetRegionName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6258,7 +6296,7 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_GetRegionId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -6300,7 +6338,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_NameRegions(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -6344,7 +6382,7 @@ static PyObject *_wrap_PyShape_NameRegions(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetRegions(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -6370,7 +6408,7 @@ static PyObject *_wrap_PyShape_GetRegions(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_AddRegion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxShapeRegion *arg2 = (wxShapeRegion *) 0 ;
@@ -6399,7 +6437,7 @@ static PyObject *_wrap_PyShape_AddRegion(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_ClearRegions(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6424,7 +6462,7 @@ static PyObject *_wrap_PyShape_ClearRegions(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_AssignNewIds(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AssignNewIds(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6449,7 +6487,7 @@ static PyObject *_wrap_PyShape_AssignNewIds(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_FindRegion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -6500,7 +6538,7 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_FindRegionNames(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FindRegionNames(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxStringList *arg2 = 0 ;
@@ -6534,7 +6572,7 @@ static PyObject *_wrap_PyShape_FindRegionNames(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_ClearText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6565,7 +6603,7 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_RemoveLine(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_RemoveLine(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -6594,7 +6632,7 @@ static PyObject *_wrap_PyShape_RemoveLine(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6641,7 +6679,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         PyObject *o = PyFloat_FromDouble((double) (*arg3));
         resultobj = t_output_helper(resultobj,o);
@@ -6656,7 +6696,7 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -6682,7 +6722,7 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6705,14 +6745,16 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -6738,7 +6780,7 @@ static PyObject *_wrap_PyShape_GetAttachments(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6785,7 +6827,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         PyObject *o = PyFloat_FromDouble((double) (*arg3));
         resultobj = t_output_helper(resultobj,o);
@@ -6800,7 +6844,7 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -6856,7 +6900,7 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6893,14 +6937,16 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_EraseLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -6946,7 +6992,7 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_DrawLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -6992,7 +7038,7 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7032,14 +7078,16 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -7067,7 +7115,7 @@ static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7101,7 +7149,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7152,14 +7200,16 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7200,14 +7250,16 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7237,7 +7289,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7266,7 +7318,7 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7292,7 +7344,7 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7321,7 +7373,7 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7347,7 +7399,7 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7376,7 +7428,7 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7402,7 +7454,7 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long arg2 ;
@@ -7431,7 +7483,7 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long result;
@@ -7457,7 +7509,7 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7487,7 +7539,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7517,7 +7569,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_Draggable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -7536,14 +7588,16 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_HasDescendant(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -7566,14 +7620,16 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 = (bool) True ;
@@ -7613,7 +7669,7 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = 0 ;
@@ -7647,7 +7703,7 @@ static PyObject *_wrap_PyShape_Copy(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = 0 ;
@@ -7681,7 +7737,7 @@ static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -7718,7 +7774,7 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PyShape_GetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -7744,7 +7800,7 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -7773,7 +7829,7 @@ static PyObject *_wrap_PyShape_SetRotation(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_ClearAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7798,7 +7854,7 @@ static PyObject *_wrap_PyShape_ClearAttachments(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_Recentre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Recentre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7832,7 +7888,7 @@ static PyObject *_wrap_PyShape_Recentre(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_ClearPointList(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearPointList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxList *arg2 = 0 ;
@@ -7866,7 +7922,7 @@ static PyObject *_wrap_PyShape_ClearPointList(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen result;
@@ -7896,7 +7952,7 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush result;
@@ -7926,7 +7982,7 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7951,7 +8007,7 @@ static PyObject *_wrap_PyShape_base_OnDelete(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7985,7 +8041,7 @@ static PyObject *_wrap_PyShape_base_OnDraw(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8019,7 +8075,7 @@ static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8059,7 +8115,7 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8093,7 +8149,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8127,7 +8183,7 @@ static PyObject *_wrap_PyShape_base_OnErase(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8161,7 +8217,7 @@ static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8195,7 +8251,7 @@ static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8240,7 +8296,7 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8285,7 +8341,7 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8330,7 +8386,7 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8363,7 +8419,7 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8413,14 +8469,16 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8476,7 +8534,7 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -8525,7 +8583,7 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8570,7 +8628,7 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8615,7 +8673,7 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -8664,7 +8722,7 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8709,7 +8767,7 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8754,7 +8812,7 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8804,7 +8862,7 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8838,7 +8896,7 @@ static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8872,7 +8930,7 @@ static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8912,7 +8970,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -8965,7 +9023,7 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -9014,7 +9072,7 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -9063,7 +9121,7 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -9096,7 +9154,7 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -9129,14 +9187,14 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject * PyShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PseudoMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *result;
     char *kwnames[] = {
@@ -9160,7 +9218,7 @@ static PyObject *_wrap_new_PseudoMetaFile(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_PseudoMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PseudoMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9185,7 +9243,7 @@ static PyObject *_wrap_delete_PseudoMetaFile(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxDC *arg2 = 0 ;
@@ -9227,7 +9285,7 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9252,7 +9310,7 @@ static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPseudoMetaFile *arg2 = 0 ;
@@ -9286,7 +9344,7 @@ static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9319,7 +9377,7 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9352,7 +9410,7 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9385,7 +9443,7 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9422,7 +9480,7 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxString *arg2 = 0 ;
@@ -9457,7 +9515,9 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -9472,7 +9532,7 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -9513,7 +9573,7 @@ static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPyDrawnShape *arg2 = (wxPyDrawnShape *) 0 ;
@@ -9542,7 +9602,7 @@ static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool arg2 ;
@@ -9571,7 +9631,7 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool result;
@@ -9590,14 +9650,16 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9630,7 +9692,7 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -9673,7 +9735,7 @@ static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *result;
@@ -9699,7 +9761,7 @@ static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -9744,7 +9806,7 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *result;
@@ -9770,7 +9832,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -9799,7 +9861,7 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int result;
@@ -9825,7 +9887,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool result;
@@ -9844,14 +9906,16 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -9890,7 +9954,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -9922,7 +9986,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -9958,7 +10022,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10004,7 +10068,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10044,7 +10108,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10076,7 +10140,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10108,7 +10172,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxString *arg2 = 0 ;
@@ -10156,7 +10220,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10189,7 +10253,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10228,7 +10292,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10261,7 +10325,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10293,7 +10357,7 @@ static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10318,7 +10382,7 @@ static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -10369,7 +10433,7 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -10418,7 +10482,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -10467,7 +10531,7 @@ static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10499,7 +10563,7 @@ static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10531,7 +10595,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10560,14 +10624,14 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *, PyObject *ar
 }
 
 
-static PyObject * PseudoMetaFile_swigregister(PyObject *, PyObject *args) {
+static PyObject * PseudoMetaFile_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -10601,7 +10665,7 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -10632,7 +10696,7 @@ static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -10661,7 +10725,7 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double result;
@@ -10687,7 +10751,7 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10712,7 +10776,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10746,7 +10810,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10780,7 +10844,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10820,7 +10884,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10854,7 +10918,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10888,7 +10952,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10922,7 +10986,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10956,7 +11020,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11001,7 +11065,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11046,7 +11110,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11091,7 +11155,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11124,7 +11188,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11174,14 +11238,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11237,7 +11303,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     bool arg2 ;
@@ -11286,7 +11352,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11331,7 +11397,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11376,7 +11442,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     bool arg2 ;
@@ -11425,7 +11491,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11470,7 +11536,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11515,7 +11581,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11565,7 +11631,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11599,7 +11665,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11633,7 +11699,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *, Py
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11673,7 +11739,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11726,7 +11792,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11775,7 +11841,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *, P
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11824,7 +11890,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11857,7 +11923,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11890,14 +11956,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject * PyRectangleShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyRectangleShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) NULL ;
     wxPyShape *arg2 = (wxPyShape *) NULL ;
@@ -11955,7 +12021,7 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -11986,7 +12052,7 @@ static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12015,7 +12081,7 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12040,7 +12106,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12074,7 +12140,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12108,7 +12174,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12148,7 +12214,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12182,7 +12248,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12216,7 +12282,7 @@ static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12250,7 +12316,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12284,7 +12350,7 @@ static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12329,7 +12395,7 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12374,7 +12440,7 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12419,7 +12485,7 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12452,7 +12518,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12502,14 +12568,16 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12565,7 +12633,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     bool arg2 ;
@@ -12614,7 +12682,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12659,7 +12727,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12704,7 +12772,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     bool arg2 ;
@@ -12753,7 +12821,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12798,7 +12866,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12843,7 +12911,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12893,7 +12961,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12927,7 +12995,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12961,7 +13029,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13001,7 +13069,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13054,7 +13122,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13103,7 +13171,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13152,7 +13220,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -13185,7 +13253,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -13218,14 +13286,14 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject * PyControlPoint_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyControlPoint_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyBitmapShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *result;
     char *kwnames[] = {
@@ -13247,7 +13315,7 @@ static PyObject *_wrap_new_PyBitmapShape(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -13278,7 +13346,7 @@ static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxBitmap *result;
@@ -13300,14 +13368,17 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 0);
+    {
+        wxBitmap* resultptr = new wxBitmap(*result);
+        resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxString result;
@@ -13339,7 +13410,7 @@ static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -13373,7 +13444,7 @@ static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -13414,7 +13485,7 @@ static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13439,7 +13510,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13473,7 +13544,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13507,7 +13578,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13547,7 +13618,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13581,7 +13652,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13615,7 +13686,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13649,7 +13720,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13683,7 +13754,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13728,7 +13799,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13773,7 +13844,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13818,7 +13889,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13851,7 +13922,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13901,14 +13972,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13964,7 +14037,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     bool arg2 ;
@@ -14013,7 +14086,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14058,7 +14131,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14103,7 +14176,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     bool arg2 ;
@@ -14152,7 +14225,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14197,7 +14270,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14242,7 +14315,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14292,7 +14365,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14326,7 +14399,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14360,7 +14433,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14400,7 +14473,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14453,7 +14526,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14502,7 +14575,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14551,7 +14624,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14584,7 +14657,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14617,14 +14690,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject * PyBitmapShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyBitmapShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDrawnShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *result;
     char *kwnames[] = {
@@ -14646,7 +14719,7 @@ static PyObject *_wrap_new_PyDrawnShape(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14677,7 +14750,7 @@ static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14702,7 +14775,7 @@ static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14727,7 +14800,7 @@ static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14773,7 +14846,7 @@ static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -14802,7 +14875,7 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -14842,7 +14915,7 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14881,7 +14954,7 @@ static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -14914,7 +14987,7 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14946,7 +15019,7 @@ static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -14985,7 +15058,7 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15017,7 +15090,7 @@ static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15053,7 +15126,7 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15086,7 +15159,7 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -15134,7 +15207,7 @@ static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int result;
@@ -15160,7 +15233,7 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPseudoMetaFile *result;
@@ -15189,7 +15262,7 @@ static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double result;
@@ -15215,7 +15288,7 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -15242,7 +15315,9 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -15257,7 +15332,7 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15294,7 +15369,7 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15326,7 +15401,7 @@ static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxColour *arg2 = 0 ;
@@ -15358,7 +15433,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15387,7 +15462,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -15436,7 +15511,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -15485,7 +15560,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -15536,7 +15611,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxColour *arg2 = 0 ;
@@ -15568,7 +15643,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15601,7 +15676,7 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -15630,7 +15705,7 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Translate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15663,7 +15738,7 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15688,7 +15763,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15722,7 +15797,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15756,7 +15831,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15796,7 +15871,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15830,7 +15905,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15864,7 +15939,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15898,7 +15973,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15932,7 +16007,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15977,7 +16052,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16022,7 +16097,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16067,7 +16142,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16100,7 +16175,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16150,14 +16225,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16213,7 +16290,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -16262,7 +16339,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16307,7 +16384,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16352,7 +16429,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -16401,7 +16478,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16446,7 +16523,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16491,7 +16568,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16541,7 +16618,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16575,7 +16652,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16609,7 +16686,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16649,7 +16726,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -16702,7 +16779,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -16751,7 +16828,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -16800,7 +16877,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16833,7 +16910,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16866,14 +16943,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *, PyObject *args, P
 }
 
 
-static PyObject * PyDrawnShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyDrawnShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -16908,7 +16985,7 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     bool result;
@@ -16927,14 +17004,16 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     double arg2 ;
@@ -16967,7 +17046,7 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_OGLConstraint_Equals(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     double arg2 ;
@@ -16994,21 +17073,23 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * OGLConstraint_swigregister(PyObject *, PyObject *args) {
+static PyObject * OGLConstraint_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyCompositeShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *result;
     char *kwnames[] = {
@@ -17030,7 +17111,7 @@ static PyObject *_wrap_new_PyCompositeShape(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -17061,7 +17142,7 @@ static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17096,7 +17177,7 @@ static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxOGLConstraint *arg2 = (wxOGLConstraint *) 0 ;
@@ -17128,7 +17209,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     int arg2 ;
@@ -17167,7 +17248,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     int arg2 ;
@@ -17207,7 +17288,7 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17232,7 +17313,7 @@ static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -17255,14 +17336,16 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxOGLConstraint *arg2 = (wxOGLConstraint *) 0 ;
@@ -17291,7 +17374,7 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17320,7 +17403,7 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *result;
@@ -17348,7 +17431,7 @@ static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *result;
@@ -17374,7 +17457,7 @@ static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *result;
@@ -17400,7 +17483,7 @@ static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17425,7 +17508,7 @@ static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool result;
@@ -17444,14 +17527,16 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17480,7 +17565,7 @@ static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17505,7 +17590,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17539,7 +17624,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17573,7 +17658,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17613,7 +17698,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17647,7 +17732,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17681,7 +17766,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17715,7 +17800,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17749,7 +17834,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -17794,7 +17879,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -17839,7 +17924,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -17884,7 +17969,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -17917,7 +18002,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17967,14 +18052,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18030,7 +18117,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool arg2 ;
@@ -18079,7 +18166,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18124,7 +18211,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18169,7 +18256,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool arg2 ;
@@ -18218,7 +18305,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18263,7 +18350,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18308,7 +18395,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18358,7 +18445,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18392,7 +18479,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18426,7 +18513,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *, Py
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18466,7 +18553,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18519,7 +18606,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18568,7 +18655,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *, P
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18617,7 +18704,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18650,7 +18737,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18683,14 +18770,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject * PyCompositeShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyCompositeShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -18724,7 +18811,7 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -18755,7 +18842,7 @@ static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -18780,7 +18867,7 @@ static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -18805,7 +18892,7 @@ static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -18830,7 +18917,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18864,7 +18951,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18898,7 +18985,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18938,7 +19025,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18972,7 +19059,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19006,7 +19093,7 @@ static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19040,7 +19127,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19074,7 +19161,7 @@ static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19119,7 +19206,7 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19164,7 +19251,7 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19209,7 +19296,7 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19242,7 +19329,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19292,14 +19379,16 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19355,7 +19444,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     bool arg2 ;
@@ -19404,7 +19493,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19449,7 +19538,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19494,7 +19583,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     bool arg2 ;
@@ -19543,7 +19632,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19588,7 +19677,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19633,7 +19722,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19683,7 +19772,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19717,7 +19806,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19751,7 +19840,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19791,7 +19880,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -19844,7 +19933,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -19893,7 +19982,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -19942,7 +20031,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19975,7 +20064,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -20008,14 +20097,14 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject * PyDividedShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyDividedShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *result;
     char *kwnames[] = {
@@ -20039,7 +20128,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -20070,7 +20159,7 @@ static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20103,7 +20192,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20136,7 +20225,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20169,7 +20258,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20202,7 +20291,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyDivisionShape_Divide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20231,7 +20320,7 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20260,7 +20349,7 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20288,7 +20377,7 @@ static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int result;
@@ -20314,7 +20403,7 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20342,7 +20431,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString result;
@@ -20374,7 +20463,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *result;
@@ -20400,7 +20489,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20428,7 +20517,7 @@ static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20456,7 +20545,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *result;
@@ -20482,7 +20571,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20519,7 +20608,7 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20552,7 +20641,7 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -20581,7 +20670,7 @@ static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20610,7 +20699,7 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -20639,7 +20728,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -20680,7 +20769,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -20725,7 +20814,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -20754,7 +20843,7 @@ static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -20783,7 +20872,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -20824,7 +20913,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -20869,7 +20958,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -20894,7 +20983,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -20928,7 +21017,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -20962,7 +21051,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21002,7 +21091,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21036,7 +21125,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21070,7 +21159,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21104,7 +21193,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21138,7 +21227,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21183,7 +21272,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21228,7 +21317,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21273,7 +21362,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21306,7 +21395,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21356,14 +21445,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21419,7 +21510,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     bool arg2 ;
@@ -21468,7 +21559,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21513,7 +21604,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21558,7 +21649,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     bool arg2 ;
@@ -21607,7 +21698,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21652,7 +21743,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21697,7 +21788,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21747,7 +21838,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21781,7 +21872,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21815,7 +21906,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21855,7 +21946,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -21908,7 +21999,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -21957,7 +22048,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *, Py
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -22006,7 +22097,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22039,7 +22130,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22072,14 +22163,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *, PyObject *args
 }
 
 
-static PyObject * PyDivisionShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyDivisionShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -22113,7 +22204,7 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -22144,7 +22235,7 @@ static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22178,7 +22269,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22212,7 +22303,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22252,7 +22343,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22286,7 +22377,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22320,7 +22411,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22354,7 +22445,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22388,7 +22479,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22433,7 +22524,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22478,7 +22569,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22523,7 +22614,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22556,7 +22647,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22606,14 +22697,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22669,7 +22762,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     bool arg2 ;
@@ -22718,7 +22811,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22763,7 +22856,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22808,7 +22901,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     bool arg2 ;
@@ -22857,7 +22950,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22902,7 +22995,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22947,7 +23040,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22997,7 +23090,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23031,7 +23124,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23065,7 +23158,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23105,7 +23198,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23158,7 +23251,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23207,7 +23300,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23256,7 +23349,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23289,7 +23382,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23322,14 +23415,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject * PyEllipseShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyEllipseShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     wxPyCircleShape *result;
@@ -23357,7 +23450,7 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -23388,7 +23481,7 @@ static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23422,7 +23515,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23456,7 +23549,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23496,7 +23589,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23530,7 +23623,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23564,7 +23657,7 @@ static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23598,7 +23691,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23632,7 +23725,7 @@ static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -23677,7 +23770,7 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -23722,7 +23815,7 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -23767,7 +23860,7 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -23800,7 +23893,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23850,14 +23943,16 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23913,7 +24008,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     bool arg2 ;
@@ -23962,7 +24057,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24007,7 +24102,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24052,7 +24147,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     bool arg2 ;
@@ -24101,7 +24196,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24146,7 +24241,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24191,7 +24286,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24241,7 +24336,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24275,7 +24370,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24309,7 +24404,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24349,7 +24444,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -24402,7 +24497,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -24451,7 +24546,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -24500,7 +24595,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24533,7 +24628,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24566,14 +24661,14 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject * PyCircleShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyCircleShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -24652,7 +24747,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_delete_ArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24677,7 +24772,7 @@ static PyObject *_wrap_delete_ArrowHead(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_ArrowHead__GetType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -24703,7 +24798,7 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ArrowHead_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -24729,7 +24824,7 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ArrowHead_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int arg2 ;
@@ -24758,7 +24853,7 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -24784,7 +24879,7 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -24810,7 +24905,7 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -24836,7 +24931,7 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ArrowHead_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -24862,7 +24957,7 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_ArrowHead_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     wxString result;
@@ -24894,7 +24989,7 @@ static PyObject *_wrap_ArrowHead_GetName(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -24923,7 +25018,7 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -24952,7 +25047,7 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     wxPseudoMetaFile *result;
@@ -24980,7 +25075,7 @@ static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ArrowHead_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     long result;
@@ -25006,7 +25101,7 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -25032,7 +25127,7 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -25058,7 +25153,7 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ArrowHead_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25087,7 +25182,7 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25116,14 +25211,14 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject * ArrowHead_swigregister(PyObject *, PyObject *args) {
+static PyObject * ArrowHead_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyLineShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *result;
     char *kwnames[] = {
@@ -25145,7 +25240,7 @@ static PyObject *_wrap_new_PyLineShape(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25176,7 +25271,7 @@ static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_AddArrow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -25254,7 +25349,7 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxArrowHead *arg2 = (wxArrowHead *) 0 ;
@@ -25290,7 +25385,7 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -25317,7 +25412,9 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp2)
         delete arg2;
@@ -25332,7 +25429,7 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 = (int) -1 ;
@@ -25363,7 +25460,7 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25409,7 +25506,7 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     long arg2 ;
@@ -25432,14 +25529,16 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -25470,7 +25569,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     {
         if (temp3)
         delete arg3;
@@ -25485,7 +25586,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool result;
@@ -25504,14 +25605,16 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25545,7 +25648,7 @@ static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25591,7 +25694,7 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25637,7 +25740,7 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     long arg2 ;
@@ -25669,7 +25772,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -25717,7 +25820,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -25770,7 +25873,7 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -25804,7 +25907,7 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double result;
@@ -25830,7 +25933,7 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_FindNth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -25877,7 +25980,7 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -25903,7 +26006,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -25929,7 +26032,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_GetEnds(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -25982,7 +26085,7 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_GetFrom(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *result;
@@ -26010,7 +26113,7 @@ static PyObject *_wrap_PyLineShape_GetFrom(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26053,7 +26156,7 @@ static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26083,7 +26186,7 @@ static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_GetTo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *result;
@@ -26111,7 +26214,7 @@ static PyObject *_wrap_PyLineShape_GetTo(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyLineShape_Initialise(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Initialise(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26136,7 +26239,7 @@ static PyObject *_wrap_PyLineShape_Initialise(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = (wxDC *) 0 ;
@@ -26165,7 +26268,7 @@ static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyLineShape_IsEnd(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26188,14 +26291,16 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_IsSpline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool result;
@@ -26214,14 +26319,16 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26250,7 +26357,7 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject *result;
@@ -26276,7 +26383,7 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26305,7 +26412,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26338,7 +26445,7 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26367,7 +26474,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_SetEnds(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -26408,7 +26515,7 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_SetFrom(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26437,7 +26544,7 @@ static PyObject *_wrap_PyLineShape_SetFrom(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26466,7 +26573,7 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_SetSpline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26495,7 +26602,7 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_SetTo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26524,7 +26631,7 @@ static PyObject *_wrap_PyLineShape_SetTo(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyLineShape_Straighten(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = (wxDC *) NULL ;
@@ -26555,7 +26662,7 @@ static PyObject *_wrap_PyLineShape_Straighten(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_Unlink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26580,7 +26687,7 @@ static PyObject *_wrap_PyLineShape_Unlink(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26613,7 +26720,7 @@ static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26646,7 +26753,7 @@ static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26669,14 +26776,16 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26706,7 +26815,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -26732,7 +26841,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -26758,7 +26867,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26792,7 +26901,7 @@ static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26826,7 +26935,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26866,7 +26975,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26900,7 +27009,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26934,7 +27043,7 @@ static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26968,7 +27077,7 @@ static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27002,7 +27111,7 @@ static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27047,7 +27156,7 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27092,7 +27201,7 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27137,7 +27246,7 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27170,7 +27279,7 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27220,14 +27329,16 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27283,7 +27394,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27332,7 +27443,7 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27377,7 +27488,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27422,7 +27533,7 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27471,7 +27582,7 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27516,7 +27627,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27561,7 +27672,7 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27611,7 +27722,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27645,7 +27756,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27679,7 +27790,7 @@ static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27719,7 +27830,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -27772,7 +27883,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -27821,7 +27932,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -27870,7 +27981,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27903,7 +28014,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27936,14 +28047,14 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * PyLineShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyLineShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyPolygonShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *result;
     char *kwnames[] = {
@@ -27965,7 +28076,7 @@ static PyObject *_wrap_new_PyPolygonShape(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -27996,7 +28107,7 @@ static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_Create(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -28025,7 +28136,7 @@ static PyObject *_wrap_PyPolygonShape_Create(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -28056,7 +28167,7 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28081,7 +28192,7 @@ static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -28112,7 +28223,7 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *result;
@@ -28138,7 +28249,7 @@ static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *result;
@@ -28164,7 +28275,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double result;
@@ -28190,7 +28301,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double result;
@@ -28216,7 +28327,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28245,7 +28356,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28274,7 +28385,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28299,7 +28410,7 @@ static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28333,7 +28444,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28367,7 +28478,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28407,7 +28518,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28441,7 +28552,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28475,7 +28586,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28509,7 +28620,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28543,7 +28654,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28588,7 +28699,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28633,7 +28744,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28678,7 +28789,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28711,7 +28822,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28761,14 +28872,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28824,7 +28937,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     bool arg2 ;
@@ -28873,7 +28986,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28918,7 +29031,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28963,7 +29076,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     bool arg2 ;
@@ -29012,7 +29125,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29057,7 +29170,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29102,7 +29215,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29152,7 +29265,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29186,7 +29299,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29220,7 +29333,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *, PyOb
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29260,7 +29373,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -29313,7 +29426,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -29362,7 +29475,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *, PyO
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -29411,7 +29524,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *, PyObj
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29444,7 +29557,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29477,14 +29590,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject * PyPolygonShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyPolygonShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -29518,7 +29631,7 @@ static PyObject *_wrap_new_PyTextShape(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -29549,7 +29662,7 @@ static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29574,7 +29687,7 @@ static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29608,7 +29721,7 @@ static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29642,7 +29755,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29682,7 +29795,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29716,7 +29829,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29750,7 +29863,7 @@ static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29784,7 +29897,7 @@ static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29818,7 +29931,7 @@ static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -29863,7 +29976,7 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -29908,7 +30021,7 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -29953,7 +30066,7 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -29986,7 +30099,7 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30036,14 +30149,16 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30099,7 +30214,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     bool arg2 ;
@@ -30148,7 +30263,7 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30193,7 +30308,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30238,7 +30353,7 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     bool arg2 ;
@@ -30287,7 +30402,7 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30332,7 +30447,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30377,7 +30492,7 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30427,7 +30542,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30461,7 +30576,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30495,7 +30610,7 @@ static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30535,7 +30650,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30588,7 +30703,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30637,7 +30752,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *, PyObje
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30686,7 +30801,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30719,7 +30834,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30752,14 +30867,14 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *, PyObject *args, Py
 }
 
 
-static PyObject * PyTextShape_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyTextShape_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Diagram(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *result;
     char *kwnames[] = {
@@ -30783,7 +30898,7 @@ static PyObject *_wrap_new_Diagram(PyObject *, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_Diagram_AddShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_AddShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -30818,7 +30933,7 @@ static PyObject *_wrap_Diagram_AddShape(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Diagram_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30852,7 +30967,7 @@ static PyObject *_wrap_Diagram_Clear(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject * obj0 = 0 ;
@@ -30877,7 +30992,7 @@ static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_DrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30927,7 +31042,7 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_FindShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     long arg2 ;
@@ -30959,7 +31074,7 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Diagram_GetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShapeCanvas *result;
@@ -30987,7 +31102,7 @@ static PyObject *_wrap_Diagram_GetCanvas(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Diagram_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int result;
@@ -31013,7 +31128,7 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double result;
@@ -31039,7 +31154,7 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int result;
@@ -31065,7 +31180,7 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Diagram_GetShapeList(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetShapeList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject *result;
@@ -31091,7 +31206,7 @@ static PyObject *_wrap_Diagram_GetShapeList(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool result;
@@ -31110,14 +31225,16 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool result;
@@ -31136,14 +31253,16 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_InsertShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_InsertShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31172,7 +31291,7 @@ static PyObject *_wrap_Diagram_InsertShape(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_RecentreAll(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RecentreAll(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31206,7 +31325,7 @@ static PyObject *_wrap_Diagram_RecentreAll(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_Redraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Redraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31240,7 +31359,7 @@ static PyObject *_wrap_Diagram_Redraw(PyObject *, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject * obj0 = 0 ;
@@ -31265,7 +31384,7 @@ static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_RemoveShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RemoveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31294,7 +31413,7 @@ static PyObject *_wrap_Diagram_RemoveShape(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_SetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -31323,7 +31442,7 @@ static PyObject *_wrap_Diagram_SetCanvas(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double arg2 ;
@@ -31352,7 +31471,7 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int arg2 ;
@@ -31381,7 +31500,7 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -31410,7 +31529,7 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -31439,7 +31558,7 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Diagram_ShowAll(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -31468,7 +31587,7 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Diagram_Snap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -31517,14 +31636,14 @@ static PyObject *_wrap_Diagram_Snap(PyObject *, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject * Diagram_swigregister(PyObject *, PyObject *args) {
+static PyObject * Diagram_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     int arg2 = (int) -1 ;
@@ -31605,7 +31724,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -31636,7 +31755,7 @@ static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31671,7 +31790,7 @@ static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -31726,7 +31845,7 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -31773,7 +31892,7 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDiagram *result;
@@ -31801,7 +31920,7 @@ static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool result;
@@ -31820,14 +31939,16 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31856,7 +31977,7 @@ static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -31895,7 +32016,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -31934,7 +32055,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -31973,7 +32094,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32012,7 +32133,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool arg2 ;
@@ -32055,7 +32176,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool arg2 ;
@@ -32098,7 +32219,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32137,7 +32258,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32176,7 +32297,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDC *arg2 = 0 ;
@@ -32210,7 +32331,7 @@ static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -32239,7 +32360,7 @@ static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDiagram *arg2 = (wxDiagram *) 0 ;
@@ -32268,7 +32389,7 @@ static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -32317,14 +32438,14 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *, PyObject *args, PyObject *
 }
 
 
-static PyObject * PyShapeCanvas_swigregister(PyObject *, PyObject *args) {
+static PyObject * PyShapeCanvas_swigregister(PyObject *self, 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 *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLInitialize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -32345,7 +32466,7 @@ static PyObject *_wrap_OGLInitialize(PyObject *, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_OGLCleanUp(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLCleanUp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -32367,879 +32488,879 @@ static PyObject *_wrap_OGLCleanUp(PyObject *, PyObject *args, PyObject *kwargs)
 
 
 static PyMethodDef SwigMethods[] = {
-        { (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_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 }
+        { (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_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 }
 };
 
 
@@ -33251,6 +33372,9 @@ static void *_p_wxScrolledWindowTo_p_wxPanel(void *x) {
 static void *_p_wxPyVScrolledWindowTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *)  ((wxPyVScrolledWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxPanel(void *x) {
+    return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPyVListBoxTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *) (wxPyVScrolledWindow *) ((wxPyVListBox *) x));
 }
@@ -33272,6 +33396,9 @@ static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) {
 static void *_p_wxPyShapeCanvasTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyShapeCanvas *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxScrolledWindow(void *x) {
+    return (void *)((wxScrolledWindow *)  ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
     return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
 }
@@ -33350,6 +33477,9 @@ static void *_p_wxSplitterWindowTo_p_wxWindow(void *x) {
 static void *_p_wxSashWindowTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxSashWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxControlTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxControl *) x));
 }
@@ -33755,6 +33885,9 @@ static void *_p_wxPyVScrolledWindowTo_p_wxObject(void *x) {
 static void *_p_wxMDIClientWindowTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMDIClientWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxSashEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxSashEvent *) x));
 }
@@ -33989,6 +34122,9 @@ static void *_p_wxTopLevelWindowTo_p_wxEvtHandler(void *x) {
 static void *_p_wxMDIClientWindowTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *) ((wxMDIClientWindow *) x));
 }
+static void *_p_wxPyScrolledWindowTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x));
+}
 static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
 }
@@ -34128,21 +34264,21 @@ static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0,
 static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0, 0, 0, 0},{"_p_wxArrowHead", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0, 0, 0, 0},{"_p_wxStringList", 0, 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_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_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_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_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_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_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_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_bool[] = {{"_p_bool", 0, "bool *", 0, 0, 0, 0},{"_p_bool", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxList[] = {{"_p_wxList", 0, "wxList *", 0, 0, 0, 0},{"_p_wxList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_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_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_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_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_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_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_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_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_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_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_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_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_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_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_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_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_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_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_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_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_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_double[] = {{"_p_double", 0, "double *", 0, 0, 0, 0},{"_p_double", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0, 0, 0, 0},{"_p_wxPyDivisionShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0, 0, 0, 0},{"_p_wxPyDrawnShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0, 0, 0, 0},{"_p_wxPyPolygonShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyBitmapShape[] = {{"_p_wxPyBitmapShape", 0, "wxPyBitmapShape *", 0, 0, 0, 0},{"_p_wxPyBitmapShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyShapeEvtHandler[] = {{"_p_wxPyShapeEvtHandler", 0, "wxPyShapeEvtHandler *", 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyEllipseShape[] = {{"_p_wxPyEllipseShape", 0, "wxPyEllipseShape *", 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyEllipseShape, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyShapeCanvas[] = {{"_p_wxPyShapeCanvas", 0, "wxPyShapeCanvas *", 0, 0, 0, 0},{"_p_wxPyShapeCanvas", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -34209,7 +34345,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
 }