reSWIGged

[wxWidgets.git] / wxPython / contrib / ogl / gtk / ogl_wrap.cpp
diff --git a/wxPython/contrib/ogl/gtk/ogl_wrap.cpp b/wxPython/contrib/ogl/gtk/ogl_wrap.cpp

index e99310827948ff430bdab809b40674396af0c334..b137351d1974f793342cc3b67da821bfe6a746ad 100644 (file)
--- a/wxPython/contrib/ogl/gtk/ogl_wrap.cpp
+++ b/wxPython/contrib/ogl/gtk/ogl_wrap.cpp
@@ -1,6 +1,6 @@
  /* ----------------------------------------------------------------------------
   * This file was automatically generated by SWIG (http://www.swig.org).
  /* ----------------------------------------------------------------------------
   * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.20
+ * Version 1.3.22
   * 
   * This file is not intended to be easily readable and contains a number of 
   * coding conventions designed to improve portability and efficiency. Do not make
   * 
   * This file is not intended to be easily readable and contains a number of 
   * coding conventions designed to improve portability and efficiency. Do not make
@@ -121,10 +121,8 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  
  #ifdef __cplusplus
  }
  
  #ifdef __cplusplus
  }
-
  #endif
  
  #endif
  
-
  /***********************************************************************
   * pyrun.swg for wxPython
   *
  /***********************************************************************
   * pyrun.swg for wxPython
   *
@@ -172,7 +170,7 @@ typedef struct swig_const_info {
    SWIG_Python_NewPointerObj(p, type, flags)
  #define SWIG_MustGetPtr(p, type, argnum, flags) \
    SWIG_Python_MustGetPtr(p, type, argnum, flags)
    SWIG_Python_NewPointerObj(p, type, flags)
  #define SWIG_MustGetPtr(p, type, argnum, flags) \
    SWIG_Python_MustGetPtr(p, type, argnum, flags)
-
+ 
  /* Python-specific SWIG API */
  #define SWIG_newvarlink() \
    SWIG_Python_newvarlink()
  /* Python-specific SWIG API */
  #define SWIG_newvarlink() \
    SWIG_Python_newvarlink()
@@ -185,6 +183,7 @@ typedef struct swig_const_info {
  #define SWIG_InstallConstants(d, constants) \
    SWIG_Python_InstallConstants(d, constants)
  
  #define SWIG_InstallConstants(d, constants) \
    SWIG_Python_InstallConstants(d, constants)
  
+typedef double (*py_objasdbl_conv)(PyObject *obj);
  
  SWIGIMPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
  SWIGIMPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
  
  SWIGIMPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
  SWIGIMPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
@@ -196,7 +195,6 @@ SWIGIMPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type
  SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
  
  
  SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
  
  
-
  /* Contract support */
  
  #define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
  /* Contract support */
  
  #define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
@@ -206,7 +204,6 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
  #endif
  
  
  #endif
  
  
-
  /* -------- TYPES TABLE (BEGIN) -------- */
  
  #define  SWIGTYPE_p_wxOGLConstraint swig_types[0] 
  /* -------- TYPES TABLE (BEGIN) -------- */
  
  #define  SWIGTYPE_p_wxOGLConstraint swig_types[0] 
@@ -217,21 +214,21 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
  #define  SWIGTYPE_p_wxRealPoint swig_types[5] 
  #define  SWIGTYPE_p_wxPyControlPoint swig_types[6] 
  #define  SWIGTYPE_p_wxArrowHead swig_types[7] 
  #define  SWIGTYPE_p_wxRealPoint swig_types[5] 
  #define  SWIGTYPE_p_wxPyControlPoint swig_types[6] 
  #define  SWIGTYPE_p_wxArrowHead swig_types[7] 
-#define  SWIGTYPE_p_wxStringList swig_types[8] 
-#define  SWIGTYPE_p_wxPanel swig_types[9] 
-#define  SWIGTYPE_p_bool swig_types[10] 
-#define  SWIGTYPE_p_wxList swig_types[11] 
-#define  SWIGTYPE_p_wxFont swig_types[12] 
-#define  SWIGTYPE_p_wxScrolledWindow swig_types[13] 
-#define  SWIGTYPE_p_wxWindow swig_types[14] 
-#define  SWIGTYPE_p_double swig_types[15] 
-#define  SWIGTYPE_p_wxPyDivisionShape swig_types[16] 
-#define  SWIGTYPE_p_wxPyDrawnShape swig_types[17] 
-#define  SWIGTYPE_p_wxPyPolygonShape swig_types[18] 
-#define  SWIGTYPE_p_wxBitmap swig_types[19] 
-#define  SWIGTYPE_p_wxObject swig_types[20] 
-#define  SWIGTYPE_p_wxPyBitmapShape swig_types[21] 
-#define  SWIGTYPE_p_wxString swig_types[22] 
+#define  SWIGTYPE_p_char swig_types[8] 
+#define  SWIGTYPE_p_wxStringList swig_types[9] 
+#define  SWIGTYPE_p_wxPanel swig_types[10] 
+#define  SWIGTYPE_p_bool swig_types[11] 
+#define  SWIGTYPE_p_wxList swig_types[12] 
+#define  SWIGTYPE_p_wxFont swig_types[13] 
+#define  SWIGTYPE_p_wxScrolledWindow swig_types[14] 
+#define  SWIGTYPE_p_wxWindow swig_types[15] 
+#define  SWIGTYPE_p_double swig_types[16] 
+#define  SWIGTYPE_p_wxPyDivisionShape swig_types[17] 
+#define  SWIGTYPE_p_wxPyDrawnShape swig_types[18] 
+#define  SWIGTYPE_p_wxPyPolygonShape swig_types[19] 
+#define  SWIGTYPE_p_wxBitmap swig_types[20] 
+#define  SWIGTYPE_p_wxObject swig_types[21] 
+#define  SWIGTYPE_p_wxPyBitmapShape swig_types[22] 
  #define  SWIGTYPE_p_wxPyShapeEvtHandler swig_types[23] 
  #define  SWIGTYPE_p_wxEvtHandler swig_types[24] 
  #define  SWIGTYPE_p_wxPyEllipseShape swig_types[25] 
  #define  SWIGTYPE_p_wxPyShapeEvtHandler swig_types[23] 
  #define  SWIGTYPE_p_wxEvtHandler swig_types[24] 
  #define  SWIGTYPE_p_wxPyEllipseShape swig_types[25] 
@@ -239,17 +236,18 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
  #define  SWIGTYPE_p_wxPoint swig_types[27] 
  #define  SWIGTYPE_p_wxDiagram swig_types[28] 
  #define  SWIGTYPE_p_wxPyShape swig_types[29] 
  #define  SWIGTYPE_p_wxPoint swig_types[27] 
  #define  SWIGTYPE_p_wxDiagram swig_types[28] 
  #define  SWIGTYPE_p_wxPyShape swig_types[29] 
-#define  SWIGTYPE_p_wxClassInfo swig_types[30] 
-#define  SWIGTYPE_p_wxPyLineShape swig_types[31] 
-#define  SWIGTYPE_p_wxPyRectangleShape swig_types[32] 
-#define  SWIGTYPE_p_wxPyCompositeShape swig_types[33] 
-#define  SWIGTYPE_p_wxPyCircleShape swig_types[34] 
-#define  SWIGTYPE_p_wxPen swig_types[35] 
-#define  SWIGTYPE_p_int swig_types[36] 
-#define  SWIGTYPE_p_wxPseudoMetaFile swig_types[37] 
-#define  SWIGTYPE_p_wxPyTextShape swig_types[38] 
-#define  SWIGTYPE_p_wxPyDividedShape swig_types[39] 
-static swig_type_info *swig_types[41];
+#define  SWIGTYPE_p_wxAttachmentPoint swig_types[30] 
+#define  SWIGTYPE_p_wxClassInfo swig_types[31] 
+#define  SWIGTYPE_p_wxPyLineShape swig_types[32] 
+#define  SWIGTYPE_p_wxPyRectangleShape swig_types[33] 
+#define  SWIGTYPE_p_wxPyCompositeShape swig_types[34] 
+#define  SWIGTYPE_p_wxPyCircleShape swig_types[35] 
+#define  SWIGTYPE_p_wxPen swig_types[36] 
+#define  SWIGTYPE_p_int swig_types[37] 
+#define  SWIGTYPE_p_wxPseudoMetaFile swig_types[38] 
+#define  SWIGTYPE_p_wxPyTextShape swig_types[39] 
+#define  SWIGTYPE_p_wxPyDividedShape swig_types[40] 
+static swig_type_info *swig_types[42];
  
  /* -------- TYPES TABLE (END) -------- */
  
  
  /* -------- TYPES TABLE (END) -------- */
  
@@ -261,6 +259,49 @@ static swig_type_info *swig_types[41];
  
  #define SWIG_name    "_ogl"
  
  
  #define SWIG_name    "_ogl"
  
+/* Auxiliar swig  macros */
+
+#ifdef __cplusplus
+#define SWIGSTATICINLINE(a) static inline a
+#define SWIGSTATIC(a) static a
+#define swig_new_array(type, size) (new type[(size)])
+#define swig_delete_array(cptr) delete[] cptr
+#define swig_const_cast(type,a) const_cast<type>(a)
+#define swig_static_cast(type,a) static_cast<type>(a)
+#define swig_reinterpret_cast(type,a) reinterpret_cast<type>(a)
+
+#ifdef HAVE_NUMERIC_CAST
+#define swig_numeric_cast(type,a) numeric_cast<type>(a)
+#else
+#define swig_numeric_cast(type,a) static_cast<type>(a)
+#endif
+
+#else /* C case */
+
+#define SWIGSTATICINLINE(a) static a
+#define SWIGSTATIC(a) static a
+#define swig_new_array(type, size) ((type*) malloc((size)*sizeof(type)))
+#define swig_delete_array(cptr) free((char*)cptr)
+#define swig_const_cast(type,a) (type)(a)
+#define swig_static_cast(type,a) (type)(a)
+#define swig_reinterpret_cast(type,a) (type)(a)
+#define swig_numeric_cast(type,a) (type)(a)
+
+#endif /* __cplusplus */
+
+
+#define SWIG_FromSignedChar     PyInt_FromLong
+#define SWIG_FromUnsignedChar   PyInt_FromLong
+#define SWIG_FromShort         PyInt_FromLong
+#define SWIG_FromUnsignedShort  PyInt_FromLong
+#define SWIG_FromInt           PyInt_FromLong
+#define SWIG_FromLong          PyInt_FromLong
+#define SWIG_FromFloat         PyFloat_FromDouble
+#define SWIG_FromDouble        PyFloat_FromDouble
+#define SWIG_FromFloat         PyFloat_FromDouble
+#define SWIG_FromDouble        PyFloat_FromDouble
+
+
  #include "wx/wxPython/wxPython.h"
  #include "wx/wxPython/pyclasses.h"
  #include "oglhelpers.h"
  #include "wx/wxPython/wxPython.h"
  #include "wx/wxPython/pyclasses.h"
  #include "oglhelpers.h"
@@ -268,6 +309,102 @@ static swig_type_info *swig_types[41];
  
   static const wxString wxPyEmptyString(wxEmptyString); 
  
  
   static const wxString wxPyEmptyString(wxEmptyString); 
  
+SWIGSTATICINLINE(double)
+SWIG_AsDouble(PyObject *obj)
+{
+    if (PyNumber_Check(obj))
+        return PyFloat_AsDouble(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
+}
+
+
+SWIGSTATICINLINE(int)
+SWIG_CheckDouble(PyObject* obj)
+{
+  SWIG_AsDouble(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
+
+#include <limits.h>
+
+
+SWIGSTATICINLINE(long)
+SWIG_CheckLongInRange(long value, const char* type,
+                     long min_value, long max_value)
+{
+  if (!PyErr_Occurred()) {
+    if (value < min_value) {
+      PyObject *err = 
+       PyString_FromFormat("value %ld is less than '%s' minimum %ld", 
+                           value, type, min_value);
+      
+      PyErr_SetObject(PyExc_OverflowError, err);
+      Py_DECREF(err);
+    } else if (value > max_value) {
+      PyObject *err = 
+       PyString_FromFormat("value %ld is greater than '%s' maximum %ld", 
+                           value, type, max_value);
+      PyErr_SetObject(PyExc_OverflowError, err);
+      Py_DECREF(err);
+    }
+  }
+  return value;
+}
+
+
+SWIGSTATICINLINE(long)
+SWIG_AsLong(PyObject * obj)
+{
+    if (PyNumber_Check(obj))
+        return PyInt_AsLong(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
+}
+
+
+#if INT_MAX != LONG_MAX
+SWIGSTATICINLINE(int)
+SWIG_AsInt(PyObject *obj)
+{ 
+  return swig_numeric_cast(int,
+    SWIG_CheckLongInRange(SWIG_AsLong(obj),
+                         "int", INT_MIN, INT_MAX));
+}
+#else
+#define SWIG_AsInt SWIG_AsLong
+#endif
+
+
+SWIGSTATICINLINE(int)
+SWIG_CheckInt(PyObject* obj)
+{
+  SWIG_AsInt(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
+
  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
      PyObject*   o2;
      PyObject*   o3;
  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
      PyObject*   o2;
      PyObject*   o3;
@@ -301,6 +438,26 @@ void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){
              self->SetClientObject(new wxPyOORClientData(_self));
          }
  
              self->SetClientObject(new wxPyOORClientData(_self));
          }
  
+SWIGSTATICINLINE(bool)
+SWIG_AsBool(PyObject *obj)
+{
+  return PyObject_IsTrue(obj) ? true : false;
+}
+
+
+SWIGSTATICINLINE(int)
+SWIG_CheckBool(PyObject* obj)
+{
+  SWIG_AsBool(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
+
      WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape);
  
  PyObject *wxPyShape_GetChildren(wxPyShape *self){
      WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape);
  
  PyObject *wxPyShape_GetChildren(wxPyShape *self){
@@ -311,10 +468,27 @@ PyObject *wxPyShape_GetLines(wxPyShape *self){
              wxList& list = self->GetLines();
              return wxPy_ConvertShapeList(&list);
          }
              wxList& list = self->GetLines();
              return wxPy_ConvertShapeList(&list);
          }
+
+SWIGSTATICINLINE(int)
+SWIG_CheckLong(PyObject* obj)
+{
+  SWIG_AsLong(obj);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
  PyObject *wxPyShape_GetRegions(wxPyShape *self){
              wxList& list = self->GetRegions();
              return wxPy_ConvertList(&list);
          }
  PyObject *wxPyShape_GetRegions(wxPyShape *self){
              wxList& list = self->GetRegions();
              return wxPy_ConvertList(&list);
          }
+PyObject *wxPyShape_GetAttachments(wxPyShape *self){
+            wxList& list = self->GetAttachments();
+            return wxPy_ConvertList(&list);            
+        }
  void wxPyShape_ApplyAttachmentOrdering(wxPyShape *self,PyObject *linesToSort){
              wxList* list = wxPy_wxListHelper(linesToSort, wxT("wxPyLineShape"));
              self->ApplyAttachmentOrdering(*list);
  void wxPyShape_ApplyAttachmentOrdering(wxPyShape *self,PyObject *linesToSort){
              wxList* list = wxPy_wxListHelper(linesToSort, wxT("wxPyLineShape"));
              self->ApplyAttachmentOrdering(*list);
@@ -431,7 +605,25 @@ PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){
              wxObject*   wxObj;
              wxNode*     node = list->GetFirst();
  
              wxObject*   wxObj;
              wxNode*     node = list->GetFirst();
  
-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();
+            pyList = PyList_New(0);
+            while (node) {
+                wxObj = node->GetData();
+                pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
+                PyList_Append(pyList, pyObj);
+                node = node->GetNext();
+            }
+            wxPyEndBlockThreads(blocked);
+            return pyList;
+        }
+PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
+            wxList* list = self->GetOriginalPoints();
+            PyObject*   pyList;
+            PyObject*   pyObj;
+            wxObject*   wxObj;
+            wxNode*     node = list->GetFirst();
+
+            bool blocked = wxPyBeginBlockThreads();
              pyList = PyList_New(0);
              while (node) {
                  wxObj = node->GetData();
              pyList = PyList_New(0);
              while (node) {
                  wxObj = node->GetData();
@@ -439,7 +631,7 @@ PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){
                  PyList_Append(pyList, pyObj);
                  node = node->GetNext();
              }
                  PyList_Append(pyList, pyObj);
                  node = node->GetNext();
              }
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
              return pyList;
          }
  
              return pyList;
          }
  
@@ -470,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) {
  // 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.");
      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");
          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++) {
          return NULL;
      }
      for (int x=0; x<count; x++) {
@@ -491,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());
              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);
      }
              return NULL;
          }
          list->Append(wxo);
      }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
      return list;
  }
  
  //---------------------------------------------------------------------------
  
  wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
      return list;
  }
  
  //---------------------------------------------------------------------------
  
  wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();
      if (!PyList_Check(pyList)) {
          PyErr_SetString(PyExc_TypeError, "Expected a list object.");
      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");
          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++) {
          return NULL;
      }
      for (int x=0; x<count; x++) {
@@ -532,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");
              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));
          }
      }
                  return NULL;
              }
              list->Append((wxObject*) new wxRealPoint(*wxo));
          }
      }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
      return list;
  }
  
      return list;
  }
  
@@ -575,7 +767,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
      wxObject*   wxObj;
      wxNode*     node = list->GetFirst();
  
      wxObject*   wxObj;
      wxNode*     node = list->GetFirst();
  
-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();
      pyList = PyList_New(0);
      while (node) {
          wxObj = node->GetData();
      pyList = PyList_New(0);
      while (node) {
          wxObj = node->GetData();
@@ -583,7 +775,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
          PyList_Append(pyList, pyObj);
          node = node->GetNext();
      }
          PyList_Append(pyList, pyObj);
          node = node->GetNext();
      }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
      return pyList;
  }
  
      return pyList;
  }
  
@@ -631,7 +823,7 @@ static PyObject *_wrap_new_ShapeRegion(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxShapeRegion, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxShapeRegion, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -650,7 +842,8 @@ static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetText",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetText",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -689,7 +882,8 @@ static PyObject *_wrap_ShapeRegion_SetFont(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFont",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxFont* temp;
          if (obj1) {
      {
          wxFont* temp;
          if (obj1) {
@@ -732,12 +926,19 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, Py
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ShapeRegion_SetMinSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMinSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMinSize(arg2,arg3);
@@ -758,12 +959,19 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObj
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ShapeRegion_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3);
@@ -784,12 +992,19 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, P
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ShapeRegion_SetPosition",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPosition(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPosition(arg2,arg3);
@@ -810,12 +1025,19 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ShapeRegion_SetProportions",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetProportions",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetProportions(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetProportions(arg2,arg3);
@@ -835,12 +1057,16 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args,
      wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "mode", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "mode", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ShapeRegion_SetFormatMode",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFormatMode",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFormatMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFormatMode(arg2);
@@ -867,7 +1093,8 @@ static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetName",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetName",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -907,7 +1134,8 @@ static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetColour",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -945,7 +1173,8 @@ static PyObject *_wrap_ShapeRegion_GetText(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetText",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetText",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetText();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetText();
@@ -976,7 +1205,8 @@ static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFont",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFont",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxFont *)(arg1)->GetFont();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxFont *)(arg1)->GetFont();
@@ -984,7 +1214,7 @@ static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObj
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1006,7 +1236,8 @@ static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *self, PyObject *args, Py
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetMinSize",kwnames,&obj0)) goto fail;
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetMinSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetMinSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetMinSize(arg2,arg3);
@@ -1044,7 +1275,8 @@ static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *self, PyObject *args,
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetProportion",kwnames,&obj0)) goto fail;
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetProportion",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetProportion(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetProportion(arg2,arg3);
@@ -1082,7 +1314,8 @@ static PyObject *_wrap_ShapeRegion_GetSize(PyObject *self, PyObject *args, PyObj
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetSize",kwnames,&obj0)) goto fail;
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetSize(arg2,arg3);
@@ -1120,7 +1353,8 @@ static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *self, PyObject *args, P
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPosition",kwnames,&obj0)) goto fail;
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPosition",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetPosition(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetPosition(arg2,arg3);
@@ -1153,7 +1387,8 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFormatMode",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFormatMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetFormatMode();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetFormatMode();
@@ -1161,7 +1396,7 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1178,7 +1413,8 @@ static PyObject *_wrap_ShapeRegion_GetName(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetName",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetName",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetName();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetName();
@@ -1209,7 +1445,8 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetColour",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetColour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetColour();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetColour();
@@ -1233,22 +1470,27 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO
  static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
  static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
-    wxColour *result;
+    wxColour result;
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
          (char *) "self", NULL 
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetActualColourObject",kwnames,&obj0)) goto fail;
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
          (char *) "self", NULL 
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetActualColourObject",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxColour *)(arg1)->GetActualColourObject();
+        result = (arg1)->GetActualColourObject();
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 0);
+    {
+        wxColour * resultptr;
+        resultptr = new wxColour((wxColour &) result);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1265,7 +1507,8 @@ static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFormattedText",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFormattedText",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          {
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          {
@@ -1276,7 +1519,7 @@ static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *ar
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxList, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxList, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1293,7 +1536,8 @@ static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPenColour",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPenColour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetPenColour();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetPenColour();
@@ -1324,7 +1568,8 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPenStyle",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPenStyle",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetPenStyle();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetPenStyle();
@@ -1332,7 +1577,7 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, P
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1344,12 +1589,16 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, P
      wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "style", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "style", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ShapeRegion_SetPenStyle",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenStyle",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPenStyle(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPenStyle(arg2);
@@ -1376,7 +1625,8 @@ static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenColour",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -1414,7 +1664,8 @@ static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetActualPen",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetActualPen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetActualPen();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetActualPen();
@@ -1422,7 +1673,7 @@ static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1439,7 +1690,8 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetWidth",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetWidth",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetWidth();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetWidth();
@@ -1447,7 +1699,7 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1464,7 +1716,8 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetHeight",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetHeight",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetHeight();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetHeight();
@@ -1472,7 +1725,7 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1488,7 +1741,8 @@ static PyObject *_wrap_ShapeRegion_ClearText(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_ClearText",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_ClearText",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearText();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearText();
@@ -1510,6 +1764,188 @@ static PyObject * ShapeRegion_swigregister(PyObject *self, PyObject *args) {
      Py_INCREF(obj);
      return Py_BuildValue((char *)"");
  }
      Py_INCREF(obj);
      return Py_BuildValue((char *)"");
  }
+static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    int arg1 = (int) 0 ;
+    double arg2 = (double) 0.0 ;
+    double arg3 = (double) 0.0 ;
+    wxAttachmentPoint *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "id",(char *) "x",(char *) "y", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AttachmentPoint",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if (obj0) {
+        arg1 = (int) SWIG_AsInt(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (double) SWIG_AsDouble(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (double) SWIG_AsDouble(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxAttachmentPoint *)new wxAttachmentPoint(arg1,arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAttachmentPoint, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
+    int arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "m_id", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_id_set",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (arg1) (arg1)->m_id = arg2;
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_id_get",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    result = (int) ((arg1)->m_id);
+    
+    resultobj = SWIG_FromInt((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
+    double arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "m_x", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_x_set",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (arg1) (arg1)->m_x = arg2;
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
+    double result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_x_get",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    result = (double) ((arg1)->m_x);
+    
+    resultobj = SWIG_FromDouble((double)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
+    double arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "m_y", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_y_set",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (arg1) (arg1)->m_y = arg2;
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
+    double result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_y_get",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    result = (double) ((arg1)->m_y);
+    
+    resultobj = SWIG_FromDouble((double)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+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 *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) NULL ;
  static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) NULL ;
@@ -1523,10 +1959,12 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyShapeEvtHandler",kwnames,&obj0,&obj1)) goto fail;
      if (obj0) {
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyShapeEvtHandler",kwnames,&obj0,&obj1)) goto fail;
      if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      if (obj1) {
      }
      if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1557,7 +1995,8 @@ static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -1585,7 +2024,8 @@ static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler__setOORInfo",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler__setOORInfo",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      arg2 = obj1;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1612,8 +2052,10 @@ static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_SetShape",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_SetShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetShape(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetShape(arg2);
@@ -1638,7 +2080,8 @@ static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_GetShape",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_GetShape",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetShape();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetShape();
@@ -1666,8 +2109,10 @@ static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_SetPreviousHandler",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_SetPreviousHandler",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPreviousHandler(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPreviousHandler(arg2);
@@ -1692,7 +2137,8 @@ static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_GetPreviousHandler",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_GetPreviousHandler",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeEvtHandler *)(arg1)->GetPreviousHandler();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeEvtHandler *)(arg1)->GetPreviousHandler();
@@ -1719,7 +2165,8 @@ static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_CreateNewCopy",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_CreateNewCopy",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeEvtHandler *)(arg1)->CreateNewCopy();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeEvtHandler *)(arg1)->CreateNewCopy();
@@ -1745,7 +2192,8 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -1771,10 +2219,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1801,10 +2253,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *self, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1833,13 +2289,17 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeEvtHandler_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeEvtHandler_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -1867,10 +2327,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1897,10 +2361,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1927,10 +2395,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *self, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1957,10 +2429,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1984,12 +2460,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -2012,12 +2505,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self,
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -2040,12 +2550,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -2066,12 +2593,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *a
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShapeEvtHandler_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -2098,19 +2632,35 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
-    PyObject * obj6 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyShapeEvtHandler_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShapeEvtHandler_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -2120,7 +2670,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -2138,19 +2690,35 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyShapeEvtHandler_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShapeEvtHandler_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -2177,14 +2745,31 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObjec
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShapeEvtHandler_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -2207,12 +2792,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, Py
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -2235,12 +2837,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -2265,14 +2884,31 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObje
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShapeEvtHandler_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -2295,12 +2931,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, P
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -2323,12 +2976,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyO
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -2353,16 +3023,32 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyOb
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyShapeEvtHandler_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShapeEvtHandler_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -2388,10 +3074,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *self
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2418,10 +3108,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *sel
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2450,13 +3144,17 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeEvtHandler_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeEvtHandler_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -2485,15 +3183,33 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, P
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyShapeEvtHandler_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyShapeEvtHandler_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -2518,13 +3234,31 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *se
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShapeEvtHandler_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -2549,13 +3283,31 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShapeEvtHandler_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -2576,12 +3328,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObje
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -2602,12 +3361,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -2640,7 +3406,8 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyShape",kwnames,&obj0)) goto fail;
      if (obj0) {
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyShape",kwnames,&obj0)) goto fail;
      if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2671,7 +3438,8 @@ static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -2703,7 +3471,8 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *self, PyObject *args,
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMax",kwnames,&obj0)) goto fail;
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMax",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetBoundingBoxMax(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetBoundingBoxMax(arg2,arg3);
@@ -2741,7 +3510,8 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *self, PyObject *args,
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMin",kwnames,&obj0)) goto fail;
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMin",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetBoundingBoxMin(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetBoundingBoxMin(arg2,arg3);
@@ -2777,14 +3547,27 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args,
      double temp6 ;
      double temp7 ;
      PyObject * obj0 = 0 ;
      double temp6 ;
      double temp7 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
      };
      
      arg6 = &temp6;
      arg7 = &temp7;
      char *kwnames[] = {
          (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
      };
      
      arg6 = &temp6;
      arg7 = &temp7;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odddd:PyShape_GetPerimeterPoint",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetPerimeterPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetPerimeterPoint(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetPerimeterPoint(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -2792,7 +3575,9 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg6));
          resultobj = t_output_helper(resultobj,o);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg6));
          resultobj = t_output_helper(resultobj,o);
@@ -2817,7 +3602,8 @@ static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetCanvas",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetCanvas",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeCanvas *)(arg1)->GetCanvas();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeCanvas *)(arg1)->GetCanvas();
@@ -2845,8 +3631,10 @@ static PyObject *_wrap_PyShape_SetCanvas(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCanvas",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCanvas",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCanvas(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCanvas(arg2);
@@ -2874,10 +3662,13 @@ static PyObject *_wrap_PyShape_AddToCanvas(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_AddToCanvas",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_AddToCanvas",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj2) {
      if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2904,8 +3695,10 @@ static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_InsertInCanvas",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_InsertInCanvas",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->InsertInCanvas(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->InsertInCanvas(arg2);
@@ -2931,8 +3724,10 @@ static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_RemoveFromCanvas",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_RemoveFromCanvas",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveFromCanvas(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveFromCanvas(arg2);
@@ -2957,7 +3752,8 @@ static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kw
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetX",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetX",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetX();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetX();
@@ -2965,7 +3761,7 @@ static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kw
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -2982,7 +3778,8 @@ static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kw
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetY",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetY",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetY();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetY();
@@ -2990,7 +3787,7 @@ static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kw
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3002,12 +3799,16 @@ static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kw
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyShape_SetX",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetX",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetX(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetX(arg2);
@@ -3027,12 +3828,16 @@ static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kw
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyShape_SetY",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetY",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetY(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetY(arg2);
@@ -3057,7 +3862,8 @@ static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetParent",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetParent",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetParent();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetParent();
@@ -3085,8 +3891,10 @@ static PyObject *_wrap_PyShape_SetParent(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetParent",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetParent",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetParent(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetParent(arg2);
@@ -3111,7 +3919,8 @@ static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetTopAncestor",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetTopAncestor",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetTopAncestor();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetTopAncestor();
@@ -3138,7 +3947,8 @@ static PyObject *_wrap_PyShape_GetChildren(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetChildren",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetChildren",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyShape_GetChildren(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyShape_GetChildren(arg1);
@@ -3162,7 +3972,8 @@ static PyObject *_wrap_PyShape_Unlink(PyObject *self, PyObject *args, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Unlink",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Unlink",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Unlink();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Unlink();
@@ -3188,8 +3999,9 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDrawHandles",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDrawHandles",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3215,7 +4027,8 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetDrawHandles",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetDrawHandles",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetDrawHandles();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetDrawHandles();
@@ -3223,7 +4036,9 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3239,7 +4054,8 @@ static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_MakeControlPoints",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_MakeControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeControlPoints();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeControlPoints();
@@ -3265,9 +4081,11 @@ static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_DeleteControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_DeleteControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj1) {
      if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3292,7 +4110,8 @@ static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ResetControlPoints",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ResetControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ResetControlPoints();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ResetControlPoints();
@@ -3317,7 +4136,8 @@ static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetEventHandler",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetEventHandler",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeEvtHandler *)(arg1)->GetEventHandler();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeEvtHandler *)(arg1)->GetEventHandler();
@@ -3345,8 +4165,10 @@ static PyObject *_wrap_PyShape_SetEventHandler(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetEventHandler",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetEventHandler",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeEvtHandler,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetEventHandler(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetEventHandler(arg2);
@@ -3370,7 +4192,8 @@ static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_MakeMandatoryControlPoints",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_MakeMandatoryControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeMandatoryControlPoints();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeMandatoryControlPoints();
@@ -3394,7 +4217,8 @@ static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ResetMandatoryControlPoints",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ResetMandatoryControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ResetMandatoryControlPoints();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ResetMandatoryControlPoints();
@@ -3419,7 +4243,8 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Recompute",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Recompute",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Recompute();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Recompute();
@@ -3427,7 +4252,9 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3443,7 +4270,8 @@ static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_CalculateSize",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_CalculateSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->CalculateSize();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->CalculateSize();
@@ -3471,13 +4299,15 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_Select",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_Select",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj1) {
      if (obj1) {
-        arg2 = PyInt_AsLong(obj1) ? true : false;
+        arg2 = (bool) SWIG_AsBool(obj1); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj2) {
          if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxDC,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3506,13 +4336,14 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_SetHighlight",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_SetHighlight",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj1) {
      if (obj1) {
-        arg2 = PyInt_AsLong(obj1) ? true : false;
+        arg2 = (bool) SWIG_AsBool(obj1); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj2) {
          if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -3539,7 +4370,8 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_IsHighlighted",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_IsHighlighted",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsHighlighted();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsHighlighted();
@@ -3547,7 +4379,9 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3564,7 +4398,8 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Selected",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Selected",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Selected();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Selected();
@@ -3572,7 +4407,9 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3589,7 +4426,8 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_AncestorSelected",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_AncestorSelected",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->AncestorSelected();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->AncestorSelected();
@@ -3597,7 +4435,9 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3610,15 +4450,21 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *ar
      int arg2 = (int) OP_ALL ;
      bool arg3 = (bool) False ;
      PyObject * obj0 = 0 ;
      int arg2 = (int) OP_ALL ;
      bool arg3 = (bool) False ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "sens",(char *) "recursive", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "sens",(char *) "recursive", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:PyShape_SetSensitivityFilter",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_SetSensitivityFilter",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if (obj2) {
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -3645,7 +4491,8 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetSensitivityFilter",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetSensitivityFilter",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetSensitivityFilter();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetSensitivityFilter();
@@ -3653,7 +4500,7 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3673,11 +4520,12 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (obj2) {
      if (PyErr_Occurred()) SWIG_fail;
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -3707,10 +4555,11 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3741,7 +4590,8 @@ static PyObject *_wrap_PyShape_GetFixedSize(PyObject *self, PyObject *args, PyOb
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedSize",kwnames,&obj0)) goto fail;
      arg2 = &temp2;
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetFixedSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetFixedSize(arg2,arg3);
@@ -3774,7 +4624,8 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedWidth",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedWidth",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetFixedWidth();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetFixedWidth();
@@ -3782,7 +4633,9 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3799,7 +4652,8 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedHeight",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedHeight",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetFixedHeight();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetFixedHeight();
@@ -3807,7 +4661,9 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3825,8 +4681,9 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetSpaceAttachments",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetSpaceAttachments",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3852,7 +4709,8 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetSpaceAttachments",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetSpaceAttachments",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetSpaceAttachments();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetSpaceAttachments();
@@ -3860,7 +4718,9 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3873,15 +4733,19 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyO
      int arg2 ;
      bool arg3 = (bool) False ;
      PyObject * obj0 = 0 ;
      int arg2 ;
      bool arg3 = (bool) False ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "mode",(char *) "redraw", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "mode",(char *) "redraw", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:PyShape_SetShadowMode",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetShadowMode",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj2) {
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -3908,7 +4772,8 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetShadowMode",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetShadowMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetShadowMode();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetShadowMode();
@@ -3916,7 +4781,7 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3934,14 +4799,21 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject
      int temp4 ;
      double temp5 ;
      PyObject * obj0 = 0 ;
      int temp4 ;
      double temp5 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      arg4 = &temp4;
      arg5 = &temp5;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      arg4 = &temp4;
      arg5 = &temp5;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_HitTest",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_HitTest",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->HitTest(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->HitTest(arg2,arg3,arg4,arg5);
@@ -3949,7 +4821,9 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      {
          PyObject *o = PyInt_FromLong((long) (*arg4));
          resultobj = t_output_helper(resultobj,o);
      {
          PyObject *o = PyInt_FromLong((long) (*arg4));
          resultobj = t_output_helper(resultobj,o);
@@ -3975,8 +4849,9 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCentreResize",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCentreResize",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4002,7 +4877,8 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetCentreResize",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetCentreResize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetCentreResize();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetCentreResize();
@@ -4010,7 +4886,9 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4028,8 +4906,9 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetMaintainAspectRatio",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetMaintainAspectRatio",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4055,7 +4934,8 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetMaintainAspectRatio",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetMaintainAspectRatio",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetMaintainAspectRatio();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetMaintainAspectRatio();
@@ -4063,7 +4943,9 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject *
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4080,7 +4962,8 @@ static PyObject *_wrap_PyShape_GetLines(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetLines",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetLines",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyShape_GetLines(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyShape_GetLines(arg1);
@@ -4106,8 +4989,9 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDisableLabel",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDisableLabel",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4133,7 +5017,8 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetDisableLabel",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetDisableLabel",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetDisableLabel();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetDisableLabel();
@@ -4141,7 +5026,9 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4153,12 +5040,16 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args,
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "mode", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "mode", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_SetAttachmentMode",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetAttachmentMode",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentMode(arg2);
@@ -4183,7 +5074,8 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetAttachmentMode",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetAttachmentMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentMode();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentMode();
@@ -4191,7 +5083,7 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4203,12 +5095,16 @@ static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *k
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      long arg2 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      long arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "i", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "i", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PyShape_SetId",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetId",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (long) SWIG_AsLong(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetId(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetId(arg2);
@@ -4233,7 +5129,8 @@ static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *k
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetId",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetId",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (long)(arg1)->GetId();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (long)(arg1)->GetId();
@@ -4241,7 +5138,7 @@ static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *k
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromLong((long)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4259,7 +5156,8 @@ static PyObject *_wrap_PyShape_SetPen(PyObject *self, PyObject *args, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetPen",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetPen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxPen* temp;
          if (obj1) {
      {
          wxPen* temp;
          if (obj1) {
@@ -4303,7 +5201,8 @@ static PyObject *_wrap_PyShape_SetBrush(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBrush",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBrush",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxBrush* temp;
          if (obj1) {
      {
          wxBrush* temp;
          if (obj1) {
@@ -4345,8 +5244,9 @@ static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kw
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Show",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Show",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4372,7 +5272,8 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_IsShown",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_IsShown",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsShown();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsShown();
@@ -4380,7 +5281,9 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4396,19 +5299,29 @@ static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kw
      bool arg5 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg5 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x1",(char *) "y1",(char *) "display", NULL 
      };
      
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x1",(char *) "y1",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|O:PyShape_Move",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShape_Move",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj4) {
      if (obj4) {
-        arg5 = PyInt_AsLong(obj4) ? true : false;
+        arg5 = (bool) SWIG_AsBool(obj4); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -4436,10 +5349,14 @@ static PyObject *_wrap_PyShape_Erase(PyObject *self, PyObject *args, PyObject *k
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Erase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Erase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4466,10 +5383,14 @@ static PyObject *_wrap_PyShape_EraseContents(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_EraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_EraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4496,10 +5417,14 @@ static PyObject *_wrap_PyShape_Draw(PyObject *self, PyObject *args, PyObject *kw
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Draw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Draw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4524,7 +5449,8 @@ static PyObject *_wrap_PyShape_Flash(PyObject *self, PyObject *args, PyObject *k
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Flash",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Flash",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Flash();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Flash();
@@ -4550,10 +5476,14 @@ static PyObject *_wrap_PyShape_MoveLinks(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_MoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_MoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4580,10 +5510,14 @@ static PyObject *_wrap_PyShape_DrawContents(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_DrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_DrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4606,15 +5540,22 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject
      double arg3 ;
      bool arg4 = (bool) True ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      bool arg4 = (bool) True ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "recursive", NULL 
      };
      
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "recursive", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|O:PyShape_SetSize",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_SetSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj3) {
      if (obj3) {
-        arg4 = PyInt_AsLong(obj3) ? true : false;
+        arg4 = (bool) SWIG_AsBool(obj3); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -4637,12 +5578,19 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args,
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_SetAttachmentSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetAttachmentSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentSize(arg2,arg3);
@@ -4668,8 +5616,10 @@ static PyObject *_wrap_PyShape_Attach(PyObject *self, PyObject *args, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Attach",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Attach",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Attach(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Attach(arg2);
@@ -4693,7 +5643,8 @@ static PyObject *_wrap_PyShape_Detach(PyObject *self, PyObject *args, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Detach",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Detach",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Detach();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Detach();
@@ -4718,7 +5669,8 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Constrain",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Constrain",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Constrain();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Constrain();
@@ -4726,7 +5678,9 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4745,14 +5699,37 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "line",(char *) "other",(char *) "attachFrom",(char *) "attachTo",(char *) "positionFrom",(char *) "positionTo", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "line",(char *) "other",(char *) "attachFrom",(char *) "attachTo",(char *) "positionFrom",(char *) "positionTo", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiii:PyShape_AddLine",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:PyShape_AddLine",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AddLine(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AddLine(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -4779,8 +5756,10 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetLinePosition",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetLinePosition",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetLinePosition(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetLinePosition(arg2);
@@ -4788,7 +5767,7 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, P
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4807,7 +5786,8 @@ static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AddText",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AddText",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -4845,7 +5825,8 @@ static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetPen",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetPen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetPen();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetPen();
@@ -4853,7 +5834,7 @@ static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject *
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4870,7 +5851,8 @@ static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBrush",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBrush",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxBrush *)(arg1)->GetBrush();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxBrush *)(arg1)->GetBrush();
@@ -4878,7 +5860,7 @@ static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4894,7 +5876,8 @@ static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_SetDefaultRegionSize",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_SetDefaultRegionSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDefaultRegionSize();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDefaultRegionSize();
@@ -4919,21 +5902,30 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "s",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "s",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:PyShape_FormatText",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_FormatText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          arg3 = wxString_in_helper(obj2);
          if (arg3 == NULL) SWIG_fail;
          temp3 = True;
      }
      }
      {
          arg3 = wxString_in_helper(obj2);
          if (arg3 == NULL) SWIG_fail;
          temp3 = True;
      }
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->FormatText(*arg2,(wxString const &)*arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->FormatText(*arg2,(wxString const &)*arg3,arg4);
@@ -4962,12 +5954,21 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyO
      int arg2 ;
      int arg3 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg2 ;
      int arg3 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "mode",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "mode",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:PyShape_SetFormatMode",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFormatMode",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFormatMode(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFormatMode(arg2,arg3);
@@ -4988,12 +5989,18 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO
      int arg2 = (int) 0 ;
      int result;
      PyObject * obj0 = 0 ;
      int arg2 = (int) 0 ;
      int result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyShape_GetFormatMode",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetFormatMode",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetFormatMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetFormatMode(arg2);
@@ -5001,7 +6008,7 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5015,12 +6022,14 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject
      int arg3 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg3 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "font",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "font",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:PyShape_SetFont",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFont",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxFont* temp;
          if (obj1) {
      {
          wxFont* temp;
          if (obj1) {
@@ -5043,6 +6052,10 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject
          else
          arg2 = NULL;
      }
          else
          arg2 = NULL;
      }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFont(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFont(arg2,arg3);
@@ -5063,12 +6076,18 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject
      int arg2 = (int) 0 ;
      wxFont *result;
      PyObject * obj0 = 0 ;
      int arg2 = (int) 0 ;
      wxFont *result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyShape_GetFont",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetFont",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxFont *)(arg1)->GetFont(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxFont *)(arg1)->GetFont(arg2);
@@ -5076,7 +6095,7 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5091,17 +6110,23 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO
      bool temp2 = False ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool temp2 = False ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "colour",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "colour",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:PyShape_SetTextColour",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
          temp2 = True;
      }
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
          temp2 = True;
      }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetTextColour((wxString const &)*arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetTextColour((wxString const &)*arg2,arg3);
@@ -5130,12 +6155,18 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyO
      int arg2 = (int) 0 ;
      wxString result;
      PyObject * obj0 = 0 ;
      int arg2 = (int) 0 ;
      wxString result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyShape_GetTextColour",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetTextColour",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetTextColour(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetTextColour(arg2);
@@ -5166,7 +6197,8 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetNumberOfTextRegions",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetNumberOfTextRegions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetNumberOfTextRegions();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetNumberOfTextRegions();
@@ -5174,7 +6206,7 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject *
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5189,17 +6221,23 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO
      bool temp2 = False ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool temp2 = False ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "name",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "name",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:PyShape_SetRegionName",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetRegionName",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
          temp2 = True;
      }
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
          temp2 = True;
      }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetRegionName((wxString const &)*arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetRegionName((wxString const &)*arg2,arg3);
@@ -5228,12 +6266,16 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyO
      int arg2 ;
      wxString result;
      PyObject * obj0 = 0 ;
      int arg2 ;
      wxString result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_GetRegionName",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionName",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetRegionName(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetRegionName(arg2);
@@ -5267,7 +6309,8 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionId",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionId",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -5280,7 +6323,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      {
          if (temp2)
          delete arg2;
      {
          if (temp2)
          delete arg2;
@@ -5308,7 +6351,8 @@ static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_NameRegions",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_NameRegions",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj1) {
          {
              arg2 = wxString_in_helper(obj1);
      if (obj1) {
          {
              arg2 = wxString_in_helper(obj1);
@@ -5348,7 +6392,8 @@ static PyObject *_wrap_PyShape_GetRegions(PyObject *self, PyObject *args, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetRegions",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetRegions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyShape_GetRegions(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyShape_GetRegions(arg1);
@@ -5374,8 +6419,10 @@ static PyObject *_wrap_PyShape_AddRegion(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AddRegion",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AddRegion",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AddRegion(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AddRegion(arg2);
@@ -5399,7 +6446,8 @@ static PyObject *_wrap_PyShape_ClearRegions(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ClearRegions",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ClearRegions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearRegions();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearRegions();
@@ -5423,7 +6471,8 @@ static PyObject *_wrap_PyShape_AssignNewIds(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_AssignNewIds",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_AssignNewIds",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AssignNewIds();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AssignNewIds();
@@ -5454,7 +6503,8 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje
      
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegion",kwnames,&obj0,&obj1)) goto fail;
      
      arg3 = &temp3;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegion",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -5499,10 +6549,14 @@ static PyObject *_wrap_PyShape_FindRegionNames(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegionNames",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegionNames",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxStringList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxStringList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5523,12 +6577,18 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObjec
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 = (int) 0 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "regionId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyShape_ClearText",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_ClearText",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearText(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearText(arg2);
@@ -5554,8 +6614,10 @@ static PyObject *_wrap_PyShape_RemoveLine(PyObject *self, PyObject *args, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_RemoveLine",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_RemoveLine",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveLine(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveLine(arg2);
@@ -5583,6 +6645,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
      double temp3 ;
      double temp4 ;
      PyObject * obj0 = 0 ;
      double temp3 ;
      double temp4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL 
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL 
@@ -5590,10 +6655,22 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
      
      arg3 = &temp3;
      arg4 = &temp4;
      
      arg3 = &temp3;
      arg4 = &temp4;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iiO:PyShape_GetAttachmentPosition",kwnames,&obj0,&arg2,&arg5,&arg6,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPosition",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg5 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg6 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if (obj4) {
      if (obj4) {
-        if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj4,(void **)(&arg7),SWIGTYPE_p_wxPyLineShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5602,7 +6679,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg3));
          resultobj = t_output_helper(resultobj,o);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg3));
          resultobj = t_output_helper(resultobj,o);
@@ -5627,7 +6706,8 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetNumberOfAttachments",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetNumberOfAttachments",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetNumberOfAttachments();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetNumberOfAttachments();
@@ -5635,7 +6715,7 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject *
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5648,12 +6728,16 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args,
      int arg2 ;
      bool result;
      PyObject * obj0 = 0 ;
      int arg2 ;
      bool result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_AttachmentIsValid",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AttachmentIsValid",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->AttachmentIsValid(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->AttachmentIsValid(arg2);
@@ -5661,7 +6745,35 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyShape_GetAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyShape *arg1 = (wxPyShape *) 0 ;
+    PyObject *result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetAttachments",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (PyObject *)wxPyShape_GetAttachments(arg1);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = result;
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5681,6 +6793,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
      double temp3 ;
      double temp4 ;
      PyObject * obj0 = 0 ;
      double temp3 ;
      double temp4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL 
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL 
@@ -5688,10 +6803,22 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
      
      arg3 = &temp3;
      arg4 = &temp4;
      
      arg3 = &temp3;
      arg4 = &temp4;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iiO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&arg2,&arg5,&arg6,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg5 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg6 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if (obj4) {
      if (obj4) {
-        if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj4,(void **)(&arg7),SWIGTYPE_p_wxPyLineShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5700,7 +6827,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg3));
          resultobj = t_output_helper(resultobj,o);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg3));
          resultobj = t_output_helper(resultobj,o);
@@ -5729,13 +6858,16 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt1",(char *) "pt2",(char *) "nth",(char *) "noArcs",(char *) "line", NULL 
      };
      
      PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt1",(char *) "pt2",(char *) "nth",(char *) "noArcs",(char *) "line", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiiO:PyShape_CalcSimpleAttachment",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_CalcSimpleAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -5744,7 +6876,12 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
          arg3 = &temp3;
          if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail;
      }
          arg3 = &temp3;
          if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail;
      }
-    if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->CalcSimpleAttachment((wxRealPoint const &)*arg2,(wxRealPoint const &)*arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->CalcSimpleAttachment((wxRealPoint const &)*arg2,(wxRealPoint const &)*arg3,arg4,arg5,arg6);
@@ -5755,7 +6892,7 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
      {
          wxRealPoint * resultptr;
          resultptr = new wxRealPoint((wxRealPoint &) result);
      {
          wxRealPoint * resultptr;
          resultptr = new wxRealPoint((wxRealPoint &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRealPoint, 1);
      }
      return resultobj;
      fail:
      }
      return resultobj;
      fail:
@@ -5773,14 +6910,18 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args
      wxRealPoint temp3 ;
      wxRealPoint temp4 ;
      PyObject * obj0 = 0 ;
      wxRealPoint temp3 ;
      wxRealPoint temp4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachmentPoint",(char *) "pt1",(char *) "pt2", NULL 
      };
      
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachmentPoint",(char *) "pt1",(char *) "pt2", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:PyShape_AttachmentSortTest",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_AttachmentSortTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          arg3 = &temp3;
          if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail;
      {
          arg3 = &temp3;
          if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail;
@@ -5796,7 +6937,9 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5811,19 +6954,28 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObje
      bool arg4 = (bool) False ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg4 = (bool) False ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "attachment",(char *) "recurse", NULL 
      };
      
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "attachment",(char *) "recurse", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iO:PyShape_EraseLinks",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_EraseLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj3) {
      }
      if (obj3) {
-        arg4 = PyInt_AsLong(obj3) ? true : false;
+        arg4 = (bool) SWIG_AsBool(obj3); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -5848,19 +7000,28 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObjec
      bool arg4 = (bool) False ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg4 = (bool) False ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "attachment",(char *) "recurse", NULL 
      };
      
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "attachment",(char *) "recurse", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iO:PyShape_DrawLinks",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_DrawLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj3) {
      }
      if (obj3) {
-        arg4 = PyInt_AsLong(obj3) ? true : false;
+        arg4 = (bool) SWIG_AsBool(obj3); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -5888,17 +7049,28 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "to_move",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "to_move",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:PyShape_MoveLineToNewAttachment",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_MoveLineToNewAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->MoveLineToNewAttachment(*arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->MoveLineToNewAttachment(*arg2,arg3,arg4,arg5);
@@ -5906,7 +7078,9 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5924,7 +7098,8 @@ static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_ApplyAttachmentOrdering",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_ApplyAttachmentOrdering",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      arg2 = obj1;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5946,12 +7121,16 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje
      int arg2 ;
      wxRealPoint result;
      PyObject * obj0 = 0 ;
      int arg2 ;
      wxRealPoint result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetBranchingAttachmentRoot(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetBranchingAttachmentRoot(arg2);
@@ -5962,7 +7141,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje
      {
          wxRealPoint * resultptr;
          resultptr = new wxRealPoint((wxRealPoint &) result);
      {
          wxRealPoint * resultptr;
          resultptr = new wxRealPoint((wxRealPoint &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRealPoint, 1);
      }
      return resultobj;
      fail:
      }
      return resultobj;
      fail:
@@ -5984,6 +7163,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje
      wxRealPoint temp5 ;
      wxRealPoint temp6 ;
      PyObject * obj0 = 0 ;
      wxRealPoint temp5 ;
      wxRealPoint temp6 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
@@ -5992,8 +7172,11 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje
          (char *) "self",(char *) "attachment",(char *) "root",(char *) "neck",(char *) "shoulder1",(char *) "shoulder2", NULL 
      };
      
          (char *) "self",(char *) "attachment",(char *) "root",(char *) "neck",(char *) "shoulder1",(char *) "shoulder2", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          arg3 = &temp3;
          if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail;
      {
          arg3 = &temp3;
          if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail;
@@ -6017,7 +7200,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6035,14 +7220,21 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj
      wxRealPoint temp4 ;
      wxRealPoint temp5 ;
      PyObject * obj0 = 0 ;
      wxRealPoint temp4 ;
      wxRealPoint temp5 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment",(char *) "n",(char *) "attachmentPoint",(char *) "stemPoint", NULL 
      };
      
      PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment",(char *) "n",(char *) "attachmentPoint",(char *) "stemPoint", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          arg4 = &temp4;
          if ( ! wxRealPoint_helper(obj3, &arg4)) SWIG_fail;
      {
          arg4 = &temp4;
          if ( ! wxRealPoint_helper(obj3, &arg4)) SWIG_fail;
@@ -6058,7 +7250,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6071,12 +7265,16 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *
      int arg2 ;
      int result;
      PyObject * obj0 = 0 ;
      int arg2 ;
      int result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_GetAttachmentLineCount",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetAttachmentLineCount",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentLineCount(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentLineCount(arg2);
@@ -6084,7 +7282,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6096,12 +7294,16 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *arg
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "len", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "len", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_SetBranchNeckLength",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchNeckLength",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchNeckLength(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchNeckLength(arg2);
@@ -6126,7 +7328,8 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchNeckLength",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchNeckLength",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetBranchNeckLength();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetBranchNeckLength();
@@ -6134,7 +7337,7 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6146,12 +7349,16 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *arg
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "len", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "len", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_SetBranchStemLength",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStemLength",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchStemLength(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchStemLength(arg2);
@@ -6176,7 +7383,8 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchStemLength",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchStemLength",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetBranchStemLength();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetBranchStemLength();
@@ -6184,7 +7392,7 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6196,12 +7404,16 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args,
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "len", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "len", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_SetBranchSpacing",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchSpacing",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchSpacing(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchSpacing(arg2);
@@ -6226,7 +7438,8 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchSpacing",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchSpacing",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetBranchSpacing();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetBranchSpacing();
@@ -6234,7 +7447,7 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6246,12 +7459,16 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, Py
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      long arg2 ;
      PyObject * obj0 = 0 ;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
      long arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "style", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "style", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PyShape_SetBranchStyle",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStyle",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (long) SWIG_AsLong(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchStyle(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchStyle(arg2);
@@ -6276,7 +7493,8 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchStyle",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchStyle",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (long)(arg1)->GetBranchStyle();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (long)(arg1)->GetBranchStyle();
@@ -6284,7 +7502,7 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromLong((long)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6297,12 +7515,16 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj
      int arg2 ;
      int result;
      PyObject * obj0 = 0 ;
      int arg2 ;
      int result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "physicalAttachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "physicalAttachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->PhysicalToLogicalAttachment(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->PhysicalToLogicalAttachment(arg2);
@@ -6310,7 +7532,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6323,12 +7545,16 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj
      int arg2 ;
      int result;
      PyObject * obj0 = 0 ;
      int arg2 ;
      int result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "logicalAttachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "logicalAttachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->LogicalToPhysicalAttachment(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->LogicalToPhysicalAttachment(arg2);
@@ -6336,7 +7562,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6353,7 +7579,8 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Draggable",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Draggable",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Draggable();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Draggable();
@@ -6361,7 +7588,9 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6380,8 +7609,10 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_HasDescendant",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_HasDescendant",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->HasDescendant(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->HasDescendant(arg2);
@@ -6389,7 +7620,9 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6410,13 +7643,14 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_CreateNewCopy",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_CreateNewCopy",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj1) {
      if (obj1) {
-        arg2 = PyInt_AsLong(obj1) ? true : false;
+        arg2 = (bool) SWIG_AsBool(obj1); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj2) {
          if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -6446,10 +7680,14 @@ static PyObject *_wrap_PyShape_Copy(PyObject *self, PyObject *args, PyObject *kw
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Copy",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Copy",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6476,10 +7714,14 @@ static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_CopyWithHandler",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_CopyWithHandler",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6502,12 +7744,22 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject *
      double arg3 ;
      double arg4 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      double arg4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oddd:PyShape_Rotate",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
@@ -6532,7 +7784,8 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetRotation",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetRotation",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetRotation();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetRotation();
@@ -6540,7 +7793,36 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyShape *arg1 = (wxPyShape *) 0 ;
+    double arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "rotation", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetRotation",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetRotation(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6556,7 +7838,8 @@ static PyObject *_wrap_PyShape_ClearAttachments(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ClearAttachments",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ClearAttachments",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearAttachments();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearAttachments();
@@ -6582,10 +7865,14 @@ static PyObject *_wrap_PyShape_Recentre(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Recentre",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Recentre",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6612,10 +7899,14 @@ static PyObject *_wrap_PyShape_ClearPointList(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_ClearPointList",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_ClearPointList",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxList,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6641,7 +7932,8 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBackgroundPen",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBackgroundPen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetBackgroundPen();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetBackgroundPen();
@@ -6652,7 +7944,7 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args,
      {
          wxPen * resultptr;
          resultptr = new wxPen((wxPen &) result);
      {
          wxPen * resultptr;
          resultptr = new wxPen((wxPen &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPen, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPen, 1);
      }
      return resultobj;
      fail:
      }
      return resultobj;
      fail:
@@ -6670,7 +7962,8 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBackgroundBrush",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBackgroundBrush",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetBackgroundBrush();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetBackgroundBrush();
@@ -6681,7 +7974,7 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args
      {
          wxBrush * resultptr;
          resultptr = new wxBrush((wxBrush &) result);
      {
          wxBrush * resultptr;
          resultptr = new wxBrush((wxBrush &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxBrush, 1);
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxBrush, 1);
      }
      return resultobj;
      fail:
      }
      return resultobj;
      fail:
@@ -6698,7 +7991,8 @@ static PyObject *_wrap_PyShape_base_OnDelete(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -6724,10 +8018,14 @@ static PyObject *_wrap_PyShape_base_OnDraw(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6754,10 +8052,14 @@ static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6786,13 +8088,17 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -6820,10 +8126,14 @@ static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6850,10 +8160,14 @@ static PyObject *_wrap_PyShape_base_OnErase(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6880,10 +8194,14 @@ static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6910,10 +8228,14 @@ static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6937,12 +8259,29 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args,
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -6965,12 +8304,29 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject *
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -6993,12 +8349,29 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args,
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -7019,12 +8392,19 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObj
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -7051,19 +8431,35 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -7073,7 +8469,9 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -7091,19 +8489,35 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -7130,14 +8544,31 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, P
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -7160,12 +8591,29 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *ar
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -7188,12 +8636,29 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -7218,14 +8683,31 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -7248,16 +8730,33 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *a
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
-        
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
+        
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
@@ -7276,12 +8775,29 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *arg
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -7306,16 +8822,32 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -7341,10 +8873,14 @@ static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7371,10 +8907,14 @@ static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7403,13 +8943,17 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -7438,15 +8982,33 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *a
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -7471,13 +9033,31 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObje
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -7502,13 +9082,31 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -7529,12 +9127,19 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args,
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -7555,12 +9160,19 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, Py
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -7615,7 +9227,8 @@ static PyObject *_wrap_delete_PseudoMetaFile(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PseudoMetaFile",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PseudoMetaFile",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          delete arg1;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          delete arg1;
@@ -7638,16 +9251,26 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObj
      double arg4 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg4 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "xoffset",(char *) "yoffset", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "xoffset",(char *) "yoffset", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd:PseudoMetaFile_Draw",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Draw",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Draw(*arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Draw(*arg2,arg3,arg4);
@@ -7671,7 +9294,8 @@ static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_Clear",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_Clear",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Clear();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Clear();
@@ -7697,10 +9321,14 @@ static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_Copy",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_Copy",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7722,12 +9350,19 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyOb
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "sx",(char *) "sy", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "sx",(char *) "sy", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PseudoMetaFile_Scale",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Scale(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Scale(arg2,arg3);
@@ -7748,12 +9383,19 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, Py
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PseudoMetaFile_ScaleTo",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_ScaleTo",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ScaleTo(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ScaleTo(arg2,arg3);
@@ -7774,12 +9416,19 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args,
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PseudoMetaFile_Translate",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Translate(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Translate(arg2,arg3);
@@ -7801,12 +9450,22 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyO
      double arg3 ;
      double arg4 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      double arg4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oddd:PseudoMetaFile_Rotate",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
@@ -7838,14 +9497,17 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_LoadFromMetaFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_LoadFromMetaFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
          temp2 = True;
      }
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
          temp2 = True;
      }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_double,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->LoadFromMetaFile((wxString const &)*arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->LoadFromMetaFile((wxString const &)*arg2,arg3,arg4);
@@ -7853,7 +9515,9 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      {
          if (temp2)
          delete arg2;
      {
          if (temp2)
          delete arg2;
@@ -7885,11 +9549,16 @@ static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PseudoMetaFile_GetBounds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PseudoMetaFile_GetBounds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_double,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_double,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_double,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetBounds(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetBounds(arg2,arg3,arg4,arg5);
@@ -7915,8 +9584,10 @@ static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_CalculateSize",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_CalculateSize",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->CalculateSize(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->CalculateSize(arg2);
@@ -7942,8 +9613,9 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetRotateable",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetRotateable",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7969,7 +9641,8 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetRotateable",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetRotateable",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetRotateable();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetRotateable();
@@ -7977,7 +9650,9 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -7990,12 +9665,19 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, Py
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PseudoMetaFile_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3);
@@ -8021,7 +9703,8 @@ static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetFillBrush",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetFillBrush",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxBrush* temp;
          if (obj1) {
      {
          wxBrush* temp;
          if (obj1) {
@@ -8062,7 +9745,8 @@ static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetFillBrush",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetFillBrush",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxBrush *)(arg1)->GetFillBrush();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxBrush *)(arg1)->GetFillBrush();
@@ -8070,7 +9754,7 @@ static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *arg
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -8088,7 +9772,8 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlinePen",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlinePen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxPen* temp;
          if (obj1) {
      {
          wxPen* temp;
          if (obj1) {
@@ -8131,7 +9816,8 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetOutlinePen",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetOutlinePen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetOutlinePen();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetOutlinePen();
@@ -8139,7 +9825,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *ar
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -8151,12 +9837,16 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *arg
      wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "op", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "op", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetOutlineOp(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetOutlineOp(arg2);
@@ -8181,7 +9871,8 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetOutlineOp",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetOutlineOp",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetOutlineOp();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetOutlineOp();
@@ -8189,7 +9880,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -8206,7 +9897,8 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_IsValid",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_IsValid",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsValid();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsValid();
@@ -8214,7 +9906,9 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -8236,7 +9930,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -8271,7 +9966,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawRectangle",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawRectangle",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -8298,16 +9994,20 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObj
      wxRect temp2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      wxRect temp2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "rect",(char *) "radius", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "rect",(char *) "radius", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:PseudoMetaFile_DrawRoundedRectangle",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      }
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3);
@@ -8340,7 +10040,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -8376,16 +10077,23 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject *
      wxRect temp2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      wxRect temp2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "rect",(char *) "startAngle",(char *) "endAngle", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "rect",(char *) "startAngle",(char *) "endAngle", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd:PseudoMetaFile_DrawEllipticArc",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      }
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4);
@@ -8412,7 +10120,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawEllipse",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawEllipse",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -8443,7 +10152,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawPoint",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -8477,7 +10187,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -8515,14 +10226,19 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args,
      int arg2 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      PyObject * obj0 = 0 ;
      int arg2 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PseudoMetaFile_DrawLines",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawLines(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawLines(arg2,arg3);
@@ -8544,14 +10260,24 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args
      wxPoint *arg3 = (wxPoint *) 0 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|i:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawPolygon(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawPolygon(arg2,arg3,arg4);
@@ -8572,14 +10298,19 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args,
      int arg2 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      PyObject * obj0 = 0 ;
      int arg2 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawSpline(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawSpline(arg2,arg3);
@@ -8606,7 +10337,8 @@ static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetClippingRect",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetClippingRect",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -8634,7 +10366,8 @@ static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_DestroyClippingRect",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_DestroyClippingRect",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DestroyClippingRect();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DestroyClippingRect();
@@ -8662,7 +10395,8 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_SetPen",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_SetPen",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxPen* temp;
          if (obj1) {
      {
          wxPen* temp;
          if (obj1) {
@@ -8682,7 +10416,7 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO
          arg2 = NULL;
      }
      if (obj2) {
          arg2 = NULL;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -8712,7 +10446,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_SetBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_SetBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxBrush* temp;
          if (obj1) {
      {
          wxBrush* temp;
          if (obj1) {
@@ -8730,7 +10465,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P
          arg2 = NULL;
      }
      if (obj2) {
          arg2 = NULL;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -8758,7 +10493,8 @@ static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetFont",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxFont* temp;
          if (obj1) {
      {
          wxFont* temp;
          if (obj1) {
@@ -8807,7 +10543,8 @@ static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetTextColour",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetTextColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
@@ -8838,7 +10575,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
@@ -8862,12 +10600,16 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject
      wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "mode", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "mode", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBackgroundMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBackgroundMode(arg2);
@@ -8894,11 +10636,21 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb
      double arg1 = (double) 0.0 ;
      double arg2 = (double) 0.0 ;
      wxPyRectangleShape *result;
      double arg1 = (double) 0.0 ;
      double arg2 = (double) 0.0 ;
      wxPyRectangleShape *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "width",(char *) "height", NULL 
      };
      
      char *kwnames[] = {
          (char *) "width",(char *) "height", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_PyRectangleShape",kwnames,&arg1,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyRectangleShape",kwnames,&obj0,&obj1)) goto fail;
+    if (obj0) {
+        arg1 = (double) SWIG_AsDouble(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (double) SWIG_AsDouble(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyRectangleShape *)new wxPyRectangleShape(arg1,arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyRectangleShape *)new wxPyRectangleShape(arg1,arg2);
@@ -8906,7 +10658,7 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyRectangleShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyRectangleShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -8926,7 +10678,8 @@ static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -8948,12 +10701,16 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject
      wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "radius", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "radius", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCornerRadius(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCornerRadius(arg2);
@@ -8968,6 +10725,32 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject
  }
  
  
  }
  
  
+static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
+    double result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyRectangleShape_GetCornerRadius",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (double)(arg1)->GetCornerRadius();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromDouble((double)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
  static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
  static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
@@ -8977,7 +10760,8 @@ static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyRectangleShape_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyRectangleShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -9003,10 +10787,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9033,10 +10821,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9065,13 +10857,17 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyRectangleShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyRectangleShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -9099,10 +10895,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9129,10 +10929,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9159,10 +10963,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *self, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9189,10 +10997,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9216,12 +11028,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -9244,12 +11073,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, P
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -9272,12 +11118,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -9298,12 +11161,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *ar
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyRectangleShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -9330,19 +11200,35 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyRectangleShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyRectangleShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -9352,7 +11238,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -9370,19 +11258,35 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyRectangleShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyRectangleShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -9409,14 +11313,31 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyRectangleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -9439,12 +11360,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyO
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -9467,12 +11405,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -9497,14 +11452,31 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObjec
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyRectangleShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -9527,12 +11499,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, Py
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -9555,12 +11544,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -9585,16 +11591,32 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObj
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyRectangleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyRectangleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -9620,10 +11642,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *self,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9650,10 +11676,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *self
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9682,13 +11712,17 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyRectangleShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyRectangleShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -9717,15 +11751,33 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, Py
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyRectangleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyRectangleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -9750,13 +11802,31 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *sel
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyRectangleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -9781,13 +11851,31 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyRectangleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -9808,12 +11896,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObjec
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -9834,12 +11929,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -9872,16 +11974,38 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje
      wxPyControlPoint *result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      wxPyControlPoint *result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "the_canvas",(char *) "object",(char *) "size",(char *) "the_xoffset",(char *) "the_yoffset",(char *) "the_type", NULL 
      };
      
      char *kwnames[] = {
          (char *) "the_canvas",(char *) "object",(char *) "size",(char *) "the_xoffset",(char *) "the_yoffset",(char *) "the_type", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOdddi:new_PyControlPoint",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_PyControlPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
      if (obj0) {
      if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      if (obj1) {
      }
      if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (double) SWIG_AsDouble(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg4 = (double) SWIG_AsDouble(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (double) SWIG_AsDouble(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9890,7 +12014,7 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyControlPoint, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyControlPoint, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -9910,7 +12034,8 @@ static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -9932,12 +12057,16 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject *
      wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "radius", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "radius", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyControlPoint_SetCornerRadius",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCornerRadius(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCornerRadius(arg2);
@@ -9961,7 +12090,8 @@ static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControlPoint_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControlPoint_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -9987,10 +12117,14 @@ static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10017,10 +12151,14 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10049,13 +12187,17 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyControlPoint_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyControlPoint_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -10083,10 +12225,14 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10113,10 +12259,14 @@ static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10143,10 +12293,14 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10173,10 +12327,14 @@ static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10200,12 +12358,29 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -10228,12 +12403,29 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyO
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -10256,12 +12448,29 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -10282,12 +12491,19 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyControlPoint_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -10314,19 +12530,35 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyControlPoint_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyControlPoint_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -10336,7 +12568,9 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -10354,19 +12588,35 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyControlPoint_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyControlPoint_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -10393,14 +12643,31 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject *
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyControlPoint_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -10423,12 +12690,29 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -10451,12 +12735,29 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -10481,14 +12782,31 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyControlPoint_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -10511,12 +12829,29 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -10539,12 +12874,29 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -10569,16 +12921,32 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObjec
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyControlPoint_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyControlPoint_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -10604,10 +12972,14 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *self, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10634,10 +13006,14 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *self,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10666,13 +13042,17 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyControlPoint_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyControlPoint_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -10701,15 +13081,33 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyOb
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyControlPoint_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyControlPoint_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -10734,13 +13132,31 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyControlPoint_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -10765,13 +13181,31 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, P
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyControlPoint_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -10792,12 +13226,19 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -10818,12 +13259,19 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *a
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyControlPoint_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -10860,7 +13308,7 @@ static PyObject *_wrap_new_PyBitmapShape(PyObject *self, PyObject *args, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyBitmapShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyBitmapShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -10880,7 +13328,8 @@ static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -10907,7 +13356,8 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_GetBitmap",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_GetBitmap",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          {
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          {
@@ -10918,7 +13368,10 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, P
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 0);
+    {
+        wxBitmap* resultptr = new wxBitmap(*result);
+        resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -10935,7 +13388,8 @@ static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_GetFilename",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_GetFilename",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetFilename();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetFilename();
@@ -10967,10 +13421,14 @@ static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_SetBitmap",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_SetBitmap",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10998,7 +13456,8 @@ static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_SetFilename",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_SetFilename",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -11035,7 +13494,8 @@ static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -11061,10 +13521,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11091,10 +13555,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11123,13 +13591,17 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyBitmapShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyBitmapShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -11157,10 +13629,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11187,10 +13663,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11217,10 +13697,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11247,10 +13731,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11274,12 +13762,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject *
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -11302,12 +13807,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -11330,12 +13852,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -11356,12 +13895,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args,
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyBitmapShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -11388,19 +13934,35 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyBitmapShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyBitmapShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -11410,7 +13972,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -11428,19 +13992,35 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyBitmapShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyBitmapShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -11467,14 +14047,31 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *a
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyBitmapShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -11497,12 +14094,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -11525,12 +14139,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -11555,14 +14186,31 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject *
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyBitmapShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -11585,12 +14233,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -11613,12 +14278,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -11643,16 +14325,32 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyBitmapShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyBitmapShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -11678,10 +14376,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *self, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11708,10 +14410,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *self, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11740,13 +14446,17 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyBitmapShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyBitmapShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -11775,15 +14485,33 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObj
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyBitmapShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyBitmapShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -11808,13 +14536,31 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyBitmapShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -11839,13 +14585,31 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, Py
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyBitmapShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -11866,12 +14630,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject *
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -11892,12 +14663,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *ar
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -11934,7 +14712,7 @@ static PyObject *_wrap_new_PyDrawnShape(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyDrawnShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDrawnShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -11954,7 +14732,8 @@ static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -11980,7 +14759,8 @@ static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_CalculateSize",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_CalculateSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->CalculateSize();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->CalculateSize();
@@ -12004,7 +14784,8 @@ static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_DestroyClippingRect",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_DestroyClippingRect",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DestroyClippingRect();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DestroyClippingRect();
@@ -12037,7 +14818,8 @@ static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -12069,12 +14851,16 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args,
      wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "angle", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "angle", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawAtAngle(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawAtAngle(arg2);
@@ -12098,16 +14884,23 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *ar
      wxRect temp2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      wxRect temp2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "rect",(char *) "startAngle",(char *) "endAngle", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "rect",(char *) "startAngle",(char *) "endAngle", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd:PyDrawnShape_DrawEllipticArc",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      }
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4);
@@ -12137,7 +14930,8 @@ static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -12166,14 +14960,19 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, Py
      int arg2 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      PyObject * obj0 = 0 ;
      int arg2 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyDrawnShape_DrawLines",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawLines(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawLines(arg2,arg3);
@@ -12200,7 +14999,8 @@ static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawPoint",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -12226,14 +15026,24 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args,
      wxPoint *arg3 = (wxPoint *) 0 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|i:PyDrawnShape_DrawPolygon",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawPolygon(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawPolygon(arg2,arg3,arg4);
@@ -12260,7 +15070,8 @@ static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawRectangle",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawRectangle",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -12287,16 +15098,20 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObjec
      wxRect temp2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      wxRect temp2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "rect",(char *) "radius", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "rect",(char *) "radius", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:PyDrawnShape_DrawRoundedRectangle",kwnames,&obj0,&obj1,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      }
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3);
@@ -12317,14 +15132,19 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, P
      int arg2 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      PyObject * obj0 = 0 ;
      int arg2 ;
      wxPoint *arg3 = (wxPoint *) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "PCOUNT",(char *) "points", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyDrawnShape_DrawSpline",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawSpline(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawSpline(arg2,arg3);
@@ -12354,7 +15174,8 @@ static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -12396,7 +15217,8 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetAngle",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetAngle",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAngle();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAngle();
@@ -12404,7 +15226,7 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -12421,7 +15243,8 @@ static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetMetaFile",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetMetaFile",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          {
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          {
@@ -12432,7 +15255,7 @@ static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPseudoMetaFile, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPseudoMetaFile, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -12449,7 +15272,8 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetRotation",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetRotation",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetRotation();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetRotation();
@@ -12457,7 +15281,7 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -12477,7 +15301,8 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_LoadFromMetaFile",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_LoadFromMetaFile",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -12490,7 +15315,9 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      {
          if (temp2)
          delete arg2;
      {
          if (temp2)
          delete arg2;
@@ -12512,12 +15339,22 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObj
      double arg3 ;
      double arg4 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      double arg4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oddd:PyDrawnShape_Rotate",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
@@ -12544,7 +15381,8 @@ static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetClippingRect",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetClippingRect",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -12575,7 +15413,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *self, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
@@ -12599,12 +15438,16 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObj
      wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "mode", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "mode", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDrawnBackgroundMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDrawnBackgroundMode(arg2);
@@ -12632,7 +15475,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_SetDrawnBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_SetDrawnBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxBrush* temp;
          if (obj1) {
      {
          wxBrush* temp;
          if (obj1) {
@@ -12650,7 +15494,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args
          arg2 = NULL;
      }
      if (obj2) {
          arg2 = NULL;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -12678,7 +15522,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnFont",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnFont",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxFont* temp;
          if (obj1) {
      {
          wxFont* temp;
          if (obj1) {
@@ -12728,7 +15573,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_SetDrawnPen",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_SetDrawnPen",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxPen* temp;
          if (obj1) {
      {
          wxPen* temp;
          if (obj1) {
@@ -12748,7 +15594,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args,
          arg2 = NULL;
      }
      if (obj2) {
          arg2 = NULL;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -12777,7 +15623,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnTextColour",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnTextColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
      {
          arg2 = &temp2;
          if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
@@ -12802,12 +15649,19 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObje
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "sx",(char *) "sy", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "sx",(char *) "sy", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_Scale",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Scale(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Scale(arg2,arg3);
@@ -12833,8 +15687,9 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetSaveToFile",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetSaveToFile",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12856,12 +15711,19 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, Py
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_Translate",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Translate(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Translate(arg2,arg3);
@@ -12885,7 +15747,8 @@ static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -12911,10 +15774,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12941,10 +15808,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12973,13 +15844,17 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -13007,10 +15882,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13037,10 +15916,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13067,10 +15950,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13097,10 +15984,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13124,16 +16015,33 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *a
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
-        
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
+        
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
@@ -13152,12 +16060,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -13180,12 +16105,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject *
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -13206,12 +16148,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args,
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -13238,19 +16187,35 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDrawnShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDrawnShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -13260,7 +16225,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -13278,19 +16245,35 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDrawnShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDrawnShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -13317,14 +16300,31 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *ar
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDrawnShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -13347,12 +16347,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -13375,12 +16392,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -13405,14 +16439,31 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *a
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDrawnShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -13435,12 +16486,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -13463,12 +16531,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -13493,16 +16578,32 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyDrawnShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDrawnShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -13528,10 +16629,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *self, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13558,10 +16663,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *self, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13590,13 +16699,17 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -13625,15 +16738,33 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObje
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyDrawnShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDrawnShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -13658,13 +16789,31 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, P
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDrawnShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -13689,13 +16838,31 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyO
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDrawnShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -13716,12 +16883,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *a
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -13742,12 +16916,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *arg
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -13775,14 +16956,18 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObjec
      wxPyShape *arg2 = (wxPyShape *) 0 ;
      PyObject *arg3 = (PyObject *) 0 ;
      wxOGLConstraint *result;
      wxPyShape *arg2 = (wxPyShape *) 0 ;
      PyObject *arg3 = (PyObject *) 0 ;
      wxOGLConstraint *result;
+    PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "type",(char *) "constraining",(char *) "constrained", NULL 
      };
      
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "type",(char *) "constraining",(char *) "constrained", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iOO:new_OGLConstraint",kwnames,&arg1,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    arg1 = (int) SWIG_AsInt(obj0); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg3 = obj2;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      arg3 = obj2;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13810,7 +16995,8 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:OGLConstraint_Evaluate",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:OGLConstraint_Evaluate",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Evaluate();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Evaluate();
@@ -13818,7 +17004,9 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -13831,12 +17019,19 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args,
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:OGLConstraint_SetSpacing",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_SetSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpacing(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpacing(arg2,arg3);
@@ -13858,12 +17053,19 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb
      double arg3 ;
      bool result;
      PyObject * obj0 = 0 ;
      double arg3 ;
      bool result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "a",(char *) "b", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "a",(char *) "b", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:OGLConstraint_Equals",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_Equals",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Equals(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Equals(arg2,arg3);
@@ -13871,7 +17073,9 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -13900,7 +17104,7 @@ static PyObject *_wrap_new_PyCompositeShape(PyObject *self, PyObject *args, PyOb
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyCompositeShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyCompositeShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -13920,7 +17124,8 @@ static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -13950,10 +17155,13 @@ static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_AddChild",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_AddChild",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj2) {
      if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13981,8 +17189,10 @@ static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_AddConstraint",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_AddConstraint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxOGLConstraint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2);
@@ -14007,15 +17217,20 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyO
      PyObject *arg4 = (PyObject *) 0 ;
      wxOGLConstraint *result;
      PyObject * obj0 = 0 ;
      PyObject *arg4 = (PyObject *) 0 ;
      wxOGLConstraint *result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "type",(char *) "constraining",(char *) "constrained", NULL 
      };
      
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "type",(char *) "constraining",(char *) "constrained", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg4 = obj3;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      arg4 = obj3;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14041,16 +17256,22 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyOb
      wxPyShape *arg4 = (wxPyShape *) 0 ;
      wxOGLConstraint *result;
      PyObject * obj0 = 0 ;
      wxPyShape *arg4 = (wxPyShape *) 0 ;
      wxOGLConstraint *result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "type",(char *) "constraining",(char *) "constrained", NULL 
      };
      
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "type",(char *) "constraining",(char *) "constrained", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2,arg3,arg4);
@@ -14076,7 +17297,8 @@ static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_CalculateSize",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_CalculateSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->CalculateSize();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->CalculateSize();
@@ -14103,8 +17325,10 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_ContainsDivision",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_ContainsDivision",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->ContainsDivision(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->ContainsDivision(arg2);
@@ -14112,7 +17336,9 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -14130,8 +17356,10 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_DeleteConstraint",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_DeleteConstraint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxOGLConstraint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DeleteConstraint(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DeleteConstraint(arg2);
@@ -14157,8 +17385,10 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_DeleteConstraintsInvolvingChild",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_DeleteConstraintsInvolvingChild",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DeleteConstraintsInvolvingChild(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DeleteConstraintsInvolvingChild(arg2);
@@ -14183,7 +17413,8 @@ static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_FindContainerImage",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_FindContainerImage",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->FindContainerImage();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->FindContainerImage();
@@ -14210,7 +17441,8 @@ static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_GetConstraints",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_GetConstraints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyCompositeShape_GetConstraints(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyCompositeShape_GetConstraints(arg1);
@@ -14235,7 +17467,8 @@ static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_GetDivisions",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_GetDivisions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyCompositeShape_GetDivisions(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyCompositeShape_GetDivisions(arg1);
@@ -14259,7 +17492,8 @@ static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_MakeContainer",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_MakeContainer",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeContainer();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeContainer();
@@ -14284,7 +17518,8 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_Recompute",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_Recompute",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Recompute();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->Recompute();
@@ -14292,7 +17527,9 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -14310,8 +17547,10 @@ static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_RemoveChild",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveChild(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveChild(arg2);
@@ -14335,7 +17574,8 @@ static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -14361,10 +17601,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14391,10 +17635,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14423,13 +17671,17 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -14457,10 +17709,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14487,10 +17743,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14517,10 +17777,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *self, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14547,10 +17811,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14574,12 +17842,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -14602,12 +17887,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, P
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -14630,12 +17932,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -14656,12 +17975,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *ar
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCompositeShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -14688,19 +18014,35 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyCompositeShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCompositeShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -14710,7 +18052,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -14728,19 +18072,35 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
-    PyObject * obj6 = 0 ;
-    char *kwnames[] = {
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
+    char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyCompositeShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCompositeShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -14767,14 +18127,31 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCompositeShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -14797,12 +18174,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyO
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -14825,12 +18219,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -14855,14 +18266,31 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObjec
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCompositeShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -14885,12 +18313,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, Py
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -14913,12 +18358,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -14943,16 +18405,32 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObj
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyCompositeShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyCompositeShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -14978,10 +18456,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *self,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15008,10 +18490,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *self
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15040,13 +18526,17 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -15075,15 +18565,33 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, Py
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyCompositeShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyCompositeShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -15108,13 +18616,31 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *sel
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCompositeShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -15139,13 +18665,31 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCompositeShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -15166,12 +18710,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObjec
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -15192,12 +18743,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -15224,11 +18782,21 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje
      double arg1 = (double) 0.0 ;
      double arg2 = (double) 0.0 ;
      wxPyDividedShape *result;
      double arg1 = (double) 0.0 ;
      double arg2 = (double) 0.0 ;
      wxPyDividedShape *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "width",(char *) "height", NULL 
      };
      
      char *kwnames[] = {
          (char *) "width",(char *) "height", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_PyDividedShape",kwnames,&arg1,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyDividedShape",kwnames,&obj0,&obj1)) goto fail;
+    if (obj0) {
+        arg1 = (double) SWIG_AsDouble(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (double) SWIG_AsDouble(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDividedShape *)new wxPyDividedShape(arg1,arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDividedShape *)new wxPyDividedShape(arg1,arg2);
@@ -15236,7 +18804,7 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyDividedShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDividedShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -15256,7 +18824,8 @@ static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -15282,7 +18851,8 @@ static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_EditRegions",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_EditRegions",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->EditRegions();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->EditRegions();
@@ -15306,7 +18876,8 @@ static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_SetRegionSizes",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_SetRegionSizes",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetRegionSizes();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetRegionSizes();
@@ -15330,7 +18901,8 @@ static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -15356,10 +18928,14 @@ static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15386,10 +18962,14 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15418,13 +18998,17 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDividedShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDividedShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -15452,10 +19036,14 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15482,10 +19070,14 @@ static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15512,10 +19104,14 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15542,10 +19138,14 @@ static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15569,12 +19169,29 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -15597,12 +19214,29 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyO
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -15625,12 +19259,29 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -15651,12 +19302,19 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDividedShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -15683,19 +19341,35 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDividedShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDividedShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -15705,7 +19379,9 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -15723,19 +19399,35 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDividedShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDividedShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -15762,14 +19454,31 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject *
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDividedShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -15792,12 +19501,29 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -15820,12 +19546,29 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -15850,14 +19593,31 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDividedShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -15880,16 +19640,33 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
-        
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
+        
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
@@ -15908,12 +19685,29 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -15938,16 +19732,32 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObjec
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyDividedShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDividedShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -15973,10 +19783,14 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *self, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16003,10 +19817,14 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *self,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16035,13 +19853,17 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDividedShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDividedShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -16070,15 +19892,33 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyOb
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyDividedShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDividedShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -16103,13 +19943,31 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDividedShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -16134,13 +19992,31 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, P
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDividedShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -16161,12 +20037,19 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -16187,12 +20070,19 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *a
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDividedShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -16251,7 +20141,8 @@ static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -16274,14 +20165,18 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *ar
      double arg2 ;
      bool arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      bool arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "bottom",(char *) "test", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "bottom",(char *) "test", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO:PyDivisionShape_AdjustBottom",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustBottom",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16303,14 +20198,18 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args
      double arg2 ;
      bool arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      bool arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "left",(char *) "test", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "left",(char *) "test", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO:PyDivisionShape_AdjustLeft",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustLeft",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16332,14 +20231,18 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *arg
      double arg2 ;
      bool arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      bool arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "right",(char *) "test", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "right",(char *) "test", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO:PyDivisionShape_AdjustRight",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustRight",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16361,14 +20264,18 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args,
      double arg2 ;
      bool arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      bool arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "top",(char *) "test", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "top",(char *) "test", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO:PyDivisionShape_AdjustTop",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16389,12 +20296,16 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, Py
      wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "direction", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "direction", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDivisionShape_Divide",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_Divide",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Divide(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Divide(arg2);
@@ -16414,12 +20325,16 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args,
      wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "side", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "side", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDivisionShape_EditEdge",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_EditEdge",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->EditEdge(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->EditEdge(arg2);
@@ -16444,7 +20359,8 @@ static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetBottomSide",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetBottomSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDivisionShape *)(arg1)->GetBottomSide();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDivisionShape *)(arg1)->GetBottomSide();
@@ -16471,7 +20387,8 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetHandleSide",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetHandleSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetHandleSide();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetHandleSide();
@@ -16479,7 +20396,7 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -16496,7 +20413,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSide",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDivisionShape *)(arg1)->GetLeftSide();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDivisionShape *)(arg1)->GetLeftSide();
@@ -16523,7 +20441,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSideColour",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSideColour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetLeftSideColour();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetLeftSideColour();
@@ -16554,7 +20473,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSidePen",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSidePen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetLeftSidePen();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetLeftSidePen();
@@ -16562,7 +20482,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject *
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -16579,7 +20499,8 @@ static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetRightSide",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetRightSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDivisionShape *)(arg1)->GetRightSide();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDivisionShape *)(arg1)->GetRightSide();
@@ -16606,7 +20527,8 @@ static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetTopSide",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetTopSide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDivisionShape *)(arg1)->GetTopSide();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyDivisionShape *)(arg1)->GetTopSide();
@@ -16633,7 +20555,8 @@ static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetTopSidePen",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetTopSidePen",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetTopSidePen();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPen *)(arg1)->GetTopSidePen();
@@ -16641,7 +20564,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -16655,14 +20578,21 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject
      double arg3 ;
      bool arg4 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      bool arg4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "side",(char *) "newPos",(char *) "test", NULL 
      };
      
      PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "side",(char *) "newPos",(char *) "test", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OidO:PyDivisionShape_ResizeAdjoining",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg4 = PyInt_AsLong(obj3) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDivisionShape_ResizeAdjoining",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (bool) SWIG_AsBool(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16684,12 +20614,19 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args,
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDivisionShape_PopupMenu",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->PopupMenu(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->PopupMenu(arg2,arg3);
@@ -16715,8 +20652,10 @@ static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetBottomSide",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetBottomSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBottomSide(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBottomSide(arg2);
@@ -16736,12 +20675,16 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *a
      wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "side", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "side", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDivisionShape_SetHandleSide",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetHandleSide",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetHandleSide(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetHandleSide(arg2);
@@ -16767,8 +20710,10 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSide",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetLeftSide(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetLeftSide(arg2);
@@ -16795,7 +20740,8 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSideColour",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSideColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -16834,7 +20780,8 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSidePen",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSidePen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxPen* temp;
          if (obj1) {
      {
          wxPen* temp;
          if (obj1) {
@@ -16878,8 +20825,10 @@ static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetRightSide",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetRightSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetRightSide(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetRightSide(arg2);
@@ -16905,8 +20854,10 @@ static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSide",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSide",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetTopSide(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetTopSide(arg2);
@@ -16933,7 +20884,8 @@ static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSideColour",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSideColour",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -16972,7 +20924,8 @@ static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSidePen",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSidePen",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          wxPen* temp;
          if (obj1) {
      {
          wxPen* temp;
          if (obj1) {
@@ -17014,7 +20967,8 @@ static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -17040,10 +20994,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17070,10 +21028,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17102,13 +21064,17 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDivisionShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDivisionShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -17136,10 +21102,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17166,10 +21136,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17196,10 +21170,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17226,10 +21204,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17253,12 +21235,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -17281,12 +21280,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, Py
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -17309,12 +21325,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -17335,12 +21368,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *arg
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDivisionShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -17367,19 +21407,35 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDivisionShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDivisionShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -17389,7 +21445,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -17407,19 +21465,35 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDivisionShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDivisionShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -17446,14 +21520,31 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDivisionShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -17476,12 +21567,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -17504,12 +21612,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -17534,14 +21659,31 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDivisionShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -17564,12 +21706,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyO
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -17592,12 +21751,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -17622,16 +21798,32 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObje
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyDivisionShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDivisionShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -17657,10 +21849,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *self,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17687,10 +21883,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *self,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17719,13 +21919,17 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDivisionShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDivisionShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -17754,15 +21958,33 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyO
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyDivisionShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDivisionShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -17787,17 +22009,35 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDivisionShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
-        
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
+        
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
@@ -17818,13 +22058,31 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDivisionShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -17845,12 +22103,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -17871,12 +22136,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject *
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -17903,11 +22175,21 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje
      double arg1 = (double) 0.0 ;
      double arg2 = (double) 0.0 ;
      wxPyEllipseShape *result;
      double arg1 = (double) 0.0 ;
      double arg2 = (double) 0.0 ;
      wxPyEllipseShape *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "width",(char *) "height", NULL 
      };
      
      char *kwnames[] = {
          (char *) "width",(char *) "height", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_PyEllipseShape",kwnames,&arg1,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEllipseShape",kwnames,&obj0,&obj1)) goto fail;
+    if (obj0) {
+        arg1 = (double) SWIG_AsDouble(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (double) SWIG_AsDouble(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyEllipseShape *)new wxPyEllipseShape(arg1,arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyEllipseShape *)new wxPyEllipseShape(arg1,arg2);
@@ -17915,7 +22197,7 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyEllipseShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyEllipseShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -17935,7 +22217,8 @@ static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -17963,10 +22246,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17993,10 +22280,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18025,13 +22316,17 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyEllipseShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyEllipseShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -18059,10 +22354,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18089,10 +22388,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18119,10 +22422,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18149,10 +22456,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18176,12 +22487,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -18204,12 +22532,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyO
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -18232,12 +22577,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -18258,12 +22620,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyEllipseShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -18290,19 +22659,35 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyEllipseShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyEllipseShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -18312,7 +22697,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -18330,19 +22717,35 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyEllipseShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyEllipseShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -18369,14 +22772,31 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject *
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyEllipseShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -18399,12 +22819,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -18427,12 +22864,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -18457,14 +22911,31 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyEllipseShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -18487,12 +22958,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -18515,12 +23003,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -18545,16 +23050,32 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObjec
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyEllipseShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyEllipseShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -18580,10 +23101,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *self, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18610,10 +23135,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *self,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18642,13 +23171,17 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyEllipseShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyEllipseShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -18677,15 +23210,33 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyOb
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyEllipseShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyEllipseShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -18710,13 +23261,31 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyEllipseShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -18741,13 +23310,31 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, P
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyEllipseShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -18768,12 +23355,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -18794,12 +23388,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *a
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -18825,11 +23426,16 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec
      PyObject *resultobj;
      double arg1 = (double) 0.0 ;
      wxPyCircleShape *result;
      PyObject *resultobj;
      double arg1 = (double) 0.0 ;
      wxPyCircleShape *result;
+    PyObject * obj0 = 0 ;
      char *kwnames[] = {
          (char *) "width", NULL 
      };
      
      char *kwnames[] = {
          (char *) "width", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|d:new_PyCircleShape",kwnames,&arg1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyCircleShape",kwnames,&obj0)) goto fail;
+    if (obj0) {
+        arg1 = (double) SWIG_AsDouble(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyCircleShape *)new wxPyCircleShape(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyCircleShape *)new wxPyCircleShape(arg1);
@@ -18837,7 +23443,7 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyCircleShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyCircleShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -18857,7 +23463,8 @@ static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -18885,10 +23492,14 @@ static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18915,10 +23526,14 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18947,13 +23562,17 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCircleShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCircleShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -18981,10 +23600,14 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19011,10 +23634,14 @@ static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19041,10 +23668,14 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19071,10 +23702,14 @@ static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19098,12 +23733,29 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject *
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -19126,12 +23778,29 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -19154,14 +23823,31 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
          
          wxPyEndAllowThreads(__tstate);
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
          
          wxPyEndAllowThreads(__tstate);
@@ -19180,12 +23866,19 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args,
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCircleShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -19212,19 +23905,35 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyCircleShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCircleShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -19234,7 +23943,9 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19252,19 +23963,35 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyCircleShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCircleShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -19291,14 +24018,31 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *a
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCircleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -19321,12 +24065,29 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -19349,12 +24110,29 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -19379,14 +24157,31 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject *
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCircleShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -19409,12 +24204,29 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -19437,12 +24249,29 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -19467,16 +24296,32 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyCircleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyCircleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -19502,10 +24347,14 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *self, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19532,10 +24381,14 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *self, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19564,13 +24417,17 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCircleShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCircleShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -19599,15 +24456,33 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObj
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyCircleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyCircleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -19632,13 +24507,31 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCircleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -19663,13 +24556,31 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, Py
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCircleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -19690,12 +24601,19 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject *
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -19716,12 +24634,19 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *ar
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCircleShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -19755,13 +24680,34 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
      long arg7 = (long) -1 ;
      wxArrowHead *result;
      bool temp5 = False ;
      long arg7 = (long) -1 ;
      wxArrowHead *result;
      bool temp5 = False ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      PyObject * obj5 = 0 ;
      PyObject * obj4 = 0 ;
      PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "type",(char *) "end",(char *) "size",(char *) "dist",(char *) "name",(char *) "mf",(char *) "arrowId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "type",(char *) "end",(char *) "size",(char *) "dist",(char *) "name",(char *) "mf",(char *) "arrowId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiddOOl:new_ArrowHead",kwnames,&arg1,&arg2,&arg3,&arg4,&obj4,&obj5,&arg7)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOOO:new_ArrowHead",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if (obj0) {
+        arg1 = (int) SWIG_AsInt(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        arg3 = (double) SWIG_AsDouble(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg4 = (double) SWIG_AsDouble(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if (obj4) {
          {
              arg5 = wxString_in_helper(obj4);
      if (obj4) {
          {
              arg5 = wxString_in_helper(obj4);
@@ -19770,7 +24716,12 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
          }
      }
      if (obj5) {
          }
      }
      if (obj5) {
-        if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxPseudoMetaFile,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (long) SWIG_AsLong(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19805,7 +24756,8 @@ static PyObject *_wrap_delete_ArrowHead(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ArrowHead",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ArrowHead",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          delete arg1;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          delete arg1;
@@ -19830,7 +24782,8 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead__GetType",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead__GetType",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->_GetType();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->_GetType();
@@ -19838,7 +24791,7 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObje
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19855,7 +24808,8 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetPosition",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetPosition",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetPosition();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetPosition();
@@ -19863,7 +24817,7 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19875,12 +24829,16 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyO
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pos", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pos", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ArrowHead_SetPosition",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetPosition",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPosition(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPosition(arg2);
@@ -19905,7 +24863,8 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetXOffset",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetXOffset",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetXOffset();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetXOffset();
@@ -19913,7 +24872,7 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19930,7 +24889,8 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetYOffset",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetYOffset",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetYOffset();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetYOffset();
@@ -19938,7 +24898,7 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19955,7 +24915,8 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetSpacing",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetSpacing",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetSpacing();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetSpacing();
@@ -19963,7 +24924,7 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19980,7 +24941,8 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetSize",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetSize();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetSize();
@@ -19988,7 +24950,7 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20005,7 +24967,8 @@ static PyObject *_wrap_ArrowHead_GetName(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetName",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetName",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetName();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetName();
@@ -20031,12 +24994,16 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyOb
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:ArrowHead_SetXOffset",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetXOffset",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetXOffset(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetXOffset(arg2);
@@ -20056,12 +25023,16 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyOb
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:ArrowHead_SetYOffset",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetYOffset",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetYOffset(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetYOffset(arg2);
@@ -20086,7 +25057,8 @@ static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetMetaFile",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetMetaFile",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPseudoMetaFile *)(arg1)->GetMetaFile();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPseudoMetaFile *)(arg1)->GetMetaFile();
@@ -20113,7 +25085,8 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetId",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetId",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (long)(arg1)->GetId();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (long)(arg1)->GetId();
@@ -20121,7 +25094,7 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromLong((long)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20138,7 +25111,8 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetArrowEnd",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetArrowEnd",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetArrowEnd();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetArrowEnd();
@@ -20146,7 +25120,7 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20163,7 +25137,8 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetArrowSize",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetArrowSize",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetArrowSize();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetArrowSize();
@@ -20171,7 +25146,7 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20183,12 +25158,16 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObjec
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "size", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "size", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:ArrowHead_SetSize",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSize",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2);
@@ -20208,12 +25187,16 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyOb
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxArrowHead *arg1 = (wxArrowHead *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "sp", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "sp", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:ArrowHead_SetSpacing",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSpacing",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpacing(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpacing(arg2);
@@ -20250,7 +25233,7 @@ static PyObject *_wrap_new_PyLineShape(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyLineShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyLineShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20270,7 +25253,8 @@ static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -20300,14 +25284,34 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
      long arg8 = (long) -1 ;
      bool temp6 = False ;
      PyObject * obj0 = 0 ;
      long arg8 = (long) -1 ;
      bool temp6 = False ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
+    PyObject * obj7 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "type",(char *) "end",(char *) "arrowSize",(char *) "xOffset",(char *) "name",(char *) "mf",(char *) "arrowId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "type",(char *) "end",(char *) "arrowSize",(char *) "xOffset",(char *) "name",(char *) "mf",(char *) "arrowId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iddOOl:PyLineShape_AddArrow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&arg8)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:PyLineShape_AddArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj2) {
+        arg3 = (int) SWIG_AsInt(obj2); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        arg4 = (double) SWIG_AsDouble(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (double) SWIG_AsDouble(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if (obj5) {
          {
              arg6 = wxString_in_helper(obj5);
      if (obj5) {
          {
              arg6 = wxString_in_helper(obj5);
@@ -20316,7 +25320,12 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
          }
      }
      if (obj6) {
          }
      }
      if (obj6) {
-        if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj6,(void **)(&arg7),SWIGTYPE_p_wxPseudoMetaFile,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    }
+    if (obj7) {
+        arg8 = (long) SWIG_AsLong(obj7); 
+        if (PyErr_Occurred()) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20349,14 +25358,19 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *arg
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "arrow",(char *) "referenceList",(char *) "end", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "arrow",(char *) "referenceList",(char *) "end", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOi:PyLineShape_AddArrowOrdered",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyLineShape_AddArrowOrdered",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg3 = obj2;
      arg3 = obj2;
+    arg4 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyLineShape_AddArrowOrdered(arg1,arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          wxPyLineShape_AddArrowOrdered(arg1,arg2,arg3,arg4);
@@ -20384,7 +25398,8 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_ClearArrow",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_ClearArrow",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
      {
          arg2 = wxString_in_helper(obj1);
          if (arg2 == NULL) SWIG_fail;
@@ -20397,7 +25412,9 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      {
          if (temp2)
          delete arg2;
      {
          if (temp2)
          delete arg2;
@@ -20417,12 +25434,18 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObjec
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      int arg2 = (int) -1 ;
      PyObject * obj0 = 0 ;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      int arg2 = (int) -1 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "position", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "position", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyLineShape_ClearArrowsAtPosition",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_ClearArrowsAtPosition",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearArrowsAtPosition(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearArrowsAtPosition(arg2);
@@ -20447,19 +25470,27 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "arrow",(char *) "xOffset",(char *) "proportionalOffset", NULL 
      };
      
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "arrow",(char *) "xOffset",(char *) "proportionalOffset", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdO:PyLineShape_DrawArrow",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg5 = PyInt_AsLong(obj4) ? true : false;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxArrowHead,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (bool) SWIG_AsBool(obj4); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20481,12 +25512,16 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a
      long arg2 ;
      bool result;
      PyObject * obj0 = 0 ;
      long arg2 ;
      bool result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "arrowId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "arrowId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (long) SWIG_AsLong(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->DeleteArrowHead(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->DeleteArrowHead(arg2);
@@ -20494,7 +25529,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20509,13 +25546,17 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
      bool result;
      bool temp3 = False ;
      PyObject * obj0 = 0 ;
      bool result;
      bool temp3 = False ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "position",(char *) "name", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "position",(char *) "name", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          arg3 = wxString_in_helper(obj2);
          if (arg3 == NULL) SWIG_fail;
      {
          arg3 = wxString_in_helper(obj2);
          if (arg3 == NULL) SWIG_fail;
@@ -20528,7 +25569,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      {
          if (temp3)
          delete arg3;
      {
          if (temp3)
          delete arg3;
@@ -20553,7 +25596,8 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_DeleteLineControlPoint",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_DeleteLineControlPoint",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->DeleteLineControlPoint();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->DeleteLineControlPoint();
@@ -20561,7 +25605,9 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20579,10 +25625,14 @@ static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DrawArrows",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DrawArrows",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20608,17 +25658,28 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, Py
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "region",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "region",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:PyLineShape_DrawRegion",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawRegion(*arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawRegion(*arg2,arg3,arg4,arg5);
@@ -20643,17 +25704,28 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, P
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "region",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "region",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:PyLineShape_EraseRegion",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_EraseRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->EraseRegion(*arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->EraseRegion(*arg2,arg3,arg4,arg5);
@@ -20674,12 +25746,16 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *arg
      long arg2 ;
      wxArrowHead *result;
      PyObject * obj0 = 0 ;
      long arg2 ;
      wxArrowHead *result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "arrowId", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "arrowId", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PyLineShape_FindArrowHeadId",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_FindArrowHeadId",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (long) SWIG_AsLong(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxArrowHead *)(arg1)->FindArrowHead(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxArrowHead *)(arg1)->FindArrowHead(arg2);
@@ -20704,13 +25780,17 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args,
      wxArrowHead *result;
      bool temp3 = False ;
      PyObject * obj0 = 0 ;
      wxArrowHead *result;
      bool temp3 = False ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "position",(char *) "name", NULL 
      };
      
      PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "position",(char *) "name", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyLineShape_FindArrowHead",kwnames,&obj0,&arg2,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          arg3 = wxString_in_helper(obj2);
          if (arg3 == NULL) SWIG_fail;
      {
          arg3 = wxString_in_helper(obj2);
          if (arg3 == NULL) SWIG_fail;
@@ -20761,7 +25841,8 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *a
      arg4 = &temp4;
      arg5 = &temp5;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindLineEndPoints",kwnames,&obj0)) goto fail;
      arg4 = &temp4;
      arg5 = &temp5;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindLineEndPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->FindLineEndPoints(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->FindLineEndPoints(arg2,arg3,arg4,arg5);
@@ -20799,12 +25880,19 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar
      double arg3 ;
      int result;
      PyObject * obj0 = 0 ;
      double arg3 ;
      int result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyLineShape_FindLinePosition",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindLinePosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->FindLinePosition(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->FindLinePosition(arg2,arg3);
@@ -20812,7 +25900,7 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20829,7 +25917,8 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindMinimumWidth",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindMinimumWidth",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->FindMinimumWidth();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->FindMinimumWidth();
@@ -20837,7 +25926,7 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20863,9 +25952,11 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj
      arg3 = &temp3;
      arg4 = &temp4;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindNth",kwnames,&obj0,&obj1,&obj2)) goto fail;
      arg3 = &temp3;
      arg4 = &temp4;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindNth",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg5 = PyInt_AsLong(obj2) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg5 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20899,7 +25990,8 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAttachmentFrom",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAttachmentFrom",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentFrom();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentFrom();
@@ -20907,7 +25999,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20924,7 +26016,8 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAttachmentTo",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAttachmentTo",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentTo();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentTo();
@@ -20932,7 +26025,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20960,7 +26053,8 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObj
      arg4 = &temp4;
      arg5 = &temp5;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetEnds",kwnames,&obj0)) goto fail;
      arg4 = &temp4;
      arg5 = &temp5;
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetEnds",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetEnds(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetEnds(arg2,arg3,arg4,arg5);
@@ -21001,7 +26095,8 @@ static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetFrom",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetFrom",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetFrom();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetFrom();
@@ -21027,14 +26122,18 @@ static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *self, PyObject *ar
      double temp3 ;
      double temp4 ;
      PyObject * obj0 = 0 ;
      double temp3 ;
      double temp4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "position", NULL 
      };
      
      arg3 = &temp3;
      arg4 = &temp4;
      char *kwnames[] = {
          (char *) "self",(char *) "position", NULL 
      };
      
      arg3 = &temp3;
      arg4 = &temp4;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyLineShape_GetLabelPosition",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetLabelPosition",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetLabelPosition(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetLabelPosition(arg2,arg3,arg4);
@@ -21069,8 +26168,10 @@ static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetNextControlPoint",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetNextControlPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxRealPoint *)(arg1)->GetNextControlPoint(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxRealPoint *)(arg1)->GetNextControlPoint(arg2);
@@ -21078,7 +26179,7 @@ static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRealPoint, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRealPoint, 0);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21095,7 +26196,8 @@ static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetTo",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetTo",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetTo();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->GetTo();
@@ -21121,7 +26223,8 @@ static PyObject *_wrap_PyLineShape_Initialise(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Initialise",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Initialise",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Initialise();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Initialise();
@@ -21147,8 +26250,10 @@ static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_InsertLineControlPoint",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_InsertLineControlPoint",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->InsertLineControlPoint(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->InsertLineControlPoint(arg2);
@@ -21175,8 +26280,10 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_IsEnd",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_IsEnd",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsEnd(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsEnd(arg2);
@@ -21184,7 +26291,9 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21201,7 +26310,8 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_IsSpline",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_IsSpline",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsSpline();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->IsSpline();
@@ -21209,7 +26319,9 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21221,12 +26333,16 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObjec
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "n", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "n", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeLineControlPoints(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeLineControlPoints(arg2);
@@ -21251,7 +26367,8 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetLineControlPoints",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetLineControlPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyLineShape_GetLineControlPoints(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxPyLineShape_GetLineControlPoints(arg1);
@@ -21271,12 +26388,16 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *a
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "fromAttach", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "fromAttach", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentFrom(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentFrom(arg2);
@@ -21297,12 +26418,19 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args
      int arg2 ;
      int arg3 ;
      PyObject * obj0 = 0 ;
      int arg2 ;
      int arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "fromAttach",(char *) "toAttach", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "fromAttach",(char *) "toAttach", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyLineShape_SetAttachments",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAttachments",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachments(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachments(arg2,arg3);
@@ -21322,12 +26450,16 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *arg
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "toAttach", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "toAttach", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyLineShape_SetAttachmentTo",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentTo",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentTo(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentTo(arg2);
@@ -21350,12 +26482,25 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObj
      double arg4 ;
      double arg5 ;
      PyObject * obj0 = 0 ;
      double arg4 ;
      double arg5 ;
      PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
      };
      
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odddd:PyLineShape_SetEnds",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_SetEnds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetEnds(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetEnds(arg2,arg3,arg4,arg5);
@@ -21381,8 +26526,10 @@ static PyObject *_wrap_PyLineShape_SetFrom(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetFrom",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetFrom",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFrom(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFrom(arg2);
@@ -21408,8 +26555,9 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetIgnoreOffsets",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetIgnoreOffsets",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21436,8 +26584,9 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetSpline",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetSpline",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21464,8 +26613,10 @@ static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetTo",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetTo",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetTo(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetTo(arg2);
@@ -21491,9 +26642,11 @@ static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_Straighten",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_Straighten",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj1) {
      if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21518,7 +26671,8 @@ static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Unlink",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Unlink",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Unlink();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Unlink();
@@ -21533,6 +26687,186 @@ static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObje
  }
  
  
  }
  
  
+static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    bool arg2 ;
+    bool arg3 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "isEnd",(char *) "isHoriz", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetAlignmentOrientation(arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    bool arg2 ;
+    int arg3 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "isEnd",(char *) "alignType", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentType",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (int) SWIG_AsInt(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetAlignmentType(arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    bool arg2 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "isEnd", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentOrientation",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->GetAlignmentOrientation(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    bool arg2 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "isEnd", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentType",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)(arg1)->GetAlignmentType(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromInt((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAlignmentStart",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)((wxPyLineShape const *)arg1)->GetAlignmentStart();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromInt((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAlignmentEnd",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)((wxPyLineShape const *)arg1)->GetAlignmentEnd();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromInt((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
  static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
  static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
@@ -21544,10 +26878,14 @@ static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21574,10 +26912,14 @@ static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21606,13 +26948,17 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLineShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLineShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -21640,10 +26986,14 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21670,10 +27020,14 @@ static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21700,10 +27054,14 @@ static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21730,10 +27088,14 @@ static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21757,12 +27119,29 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *ar
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -21785,12 +27164,29 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -21813,12 +27209,29 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *a
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -21839,12 +27252,19 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, P
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyLineShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -21871,19 +27291,35 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyLineShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -21893,7 +27329,9 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21911,19 +27349,35 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -21950,14 +27404,31 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *arg
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyLineShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -21980,12 +27451,29 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -22008,12 +27496,29 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject *
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -22038,14 +27543,31 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *ar
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyLineShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -22068,12 +27590,29 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -22096,12 +27635,29 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -22126,16 +27682,32 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject *
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyLineShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyLineShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -22161,10 +27733,14 @@ static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22191,10 +27767,14 @@ static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *self, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22223,13 +27803,17 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLineShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLineShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -22258,15 +27842,33 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObjec
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyLineShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyLineShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -22291,13 +27893,31 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, Py
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyLineShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -22322,13 +27942,31 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyLineShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -22349,12 +27987,19 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *ar
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyLineShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -22375,12 +28020,19 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyLineShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -22417,7 +28069,7 @@ static PyObject *_wrap_new_PyPolygonShape(PyObject *self, PyObject *args, PyObje
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyPolygonShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyPolygonShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -22437,7 +28089,8 @@ static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -22465,12 +28118,152 @@ static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyO
          (char *) "self",(char *) "points", NULL 
      };
      
          (char *) "self",(char *) "points", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_Create",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = obj1;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_Create",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = obj1;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (PyObject *)wxPyPolygonShape_Create(arg1,arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = result;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    int arg2 = (int) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "pos", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyPolygonShape_AddPolygonPoint",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->AddPolygonPoint(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_CalculatePolygonCentre",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->CalculatePolygonCentre();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    int arg2 = (int) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "pos", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyPolygonShape_DeletePolygonPoint",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->DeletePolygonPoint(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    PyObject *result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetPoints",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (PyObject *)wxPyPolygonShape_GetPoints(arg1);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = result;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    PyObject *result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalPoints",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxPyPolygonShape_Create(arg1,arg2);
+        result = (PyObject *)wxPyPolygonShape_GetOriginalPoints(arg1);
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
@@ -22482,69 +28275,76 @@ static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyO
  }
  
  
  }
  
  
-static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
-    int arg2 = (int) 0 ;
+    double result;
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
-        (char *) "self",(char *) "pos", NULL 
+        (char *) "self", NULL 
      };
      
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyPolygonShape_AddPolygonPoint",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalWidth",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->AddPolygonPoint(arg2);
+        result = (double)((wxPyPolygonShape const *)arg1)->GetOriginalWidth();
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
  }
  
  
      return resultobj;
      fail:
      return NULL;
  }
  
  
-static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    double result;
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
          (char *) "self", NULL 
      };
      
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
          (char *) "self", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_CalculatePolygonCentre",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalHeight",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->CalculatePolygonCentre();
+        result = (double)((wxPyPolygonShape const *)arg1)->GetOriginalHeight();
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
  }
  
  
      return resultobj;
      fail:
      return NULL;
  }
  
  
-static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
-    int arg2 = (int) 0 ;
+    double arg2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
      char *kwnames[] = {
-        (char *) "self",(char *) "pos", NULL 
+        (char *) "self",(char *) "w", NULL 
      };
      
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyPolygonShape_DeletePolygonPoint",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->DeletePolygonPoint(arg2);
+        (arg1)->SetOriginalWidth(arg2);
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
@@ -22556,25 +28356,29 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObjec
  }
  
  
  }
  
  
-static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
-    PyObject *result;
+    double arg2 ;
      PyObject * obj0 = 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
      char *kwnames[] = {
-        (char *) "self", NULL 
+        (char *) "self",(char *) "h", NULL 
      };
      
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxPyPolygonShape_GetPoints(arg1);
+        (arg1)->SetOriginalHeight(arg2);
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = result;
+    Py_INCREF(Py_None); resultobj = Py_None;
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -22590,7 +28394,8 @@ static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_UpdateOriginalPoints",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_UpdateOriginalPoints",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->UpdateOriginalPoints();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->UpdateOriginalPoints();
@@ -22616,10 +28421,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *self, PyObject *args
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22646,10 +28455,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22678,13 +28491,17 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyPolygonShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyPolygonShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -22712,10 +28529,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22742,10 +28563,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22772,10 +28597,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *self, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22802,10 +28631,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22829,12 +28662,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -22857,12 +28707,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyO
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -22885,12 +28752,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -22911,12 +28795,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyPolygonShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -22943,19 +28834,35 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyPolygonShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyPolygonShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -22965,7 +28872,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -22983,19 +28892,35 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyPolygonShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyPolygonShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -23022,14 +28947,31 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject *
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyPolygonShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -23052,12 +28994,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObj
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -23080,12 +29039,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -23110,14 +29086,31 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyPolygonShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -23140,12 +29133,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyOb
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -23168,12 +29178,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -23198,16 +29225,32 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObjec
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyPolygonShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyPolygonShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -23233,10 +29276,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *self, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23263,10 +29310,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *self,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23295,13 +29346,17 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyPolygonShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyPolygonShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -23330,15 +29385,33 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyOb
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyPolygonShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyPolygonShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -23363,13 +29436,31 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self,
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyPolygonShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -23394,13 +29485,31 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, P
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyPolygonShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -23421,12 +29530,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -23447,12 +29563,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *a
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -23479,11 +29602,21 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject
      double arg1 = (double) 0.0 ;
      double arg2 = (double) 0.0 ;
      wxPyTextShape *result;
      double arg1 = (double) 0.0 ;
      double arg2 = (double) 0.0 ;
      wxPyTextShape *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "width",(char *) "height", NULL 
      };
      
      char *kwnames[] = {
          (char *) "width",(char *) "height", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_PyTextShape",kwnames,&arg1,&arg2)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyTextShape",kwnames,&obj0,&obj1)) goto fail;
+    if (obj0) {
+        arg1 = (double) SWIG_AsDouble(obj0); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (double) SWIG_AsDouble(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyTextShape *)new wxPyTextShape(arg1,arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyTextShape *)new wxPyTextShape(arg1,arg2);
@@ -23491,7 +29624,7 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyTextShape, 1);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTextShape, 1);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -23511,7 +29644,8 @@ static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -23537,7 +29671,8 @@ static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyTextShape_base_OnDelete",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyTextShape_base_OnDelete",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDelete();
@@ -23563,10 +29698,14 @@ static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23593,10 +29732,14 @@ static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23625,13 +29768,17 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyTextShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyTextShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -23659,10 +29806,14 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23689,10 +29840,14 @@ static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23719,10 +29874,14 @@ static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *self, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23749,10 +29908,14 @@ static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *self, PyObject *ar
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23776,12 +29939,29 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *ar
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
@@ -23804,12 +29984,29 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObje
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5);
@@ -23832,12 +30029,29 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *a
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5);
@@ -23858,12 +30072,19 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, P
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyTextShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -23890,19 +30111,35 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyTextShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyTextShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -23912,7 +30149,9 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -23930,19 +30169,35 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      bool arg7 = (bool) True ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
      PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyTextShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyTextShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj6) {
      if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+        arg7 = (bool) SWIG_AsBool(obj6); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -23969,14 +30224,31 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *arg
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyTextShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -23999,12 +30271,29 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5);
@@ -24027,12 +30316,29 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject *
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5);
@@ -24057,14 +30363,31 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *ar
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyTextShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6);
@@ -24087,12 +30410,29 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObjec
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5);
@@ -24115,12 +30455,29 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      int arg4 = (int) 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5);
@@ -24145,16 +30502,32 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject *
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyTextShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyTextShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -24180,10 +30553,14 @@ static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *self, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24210,10 +30587,14 @@ static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *self, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24242,13 +30623,17 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyTextShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyTextShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+        arg3 = (bool) SWIG_AsBool(obj2); 
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
          if (PyErr_Occurred()) SWIG_fail;
      }
      {
@@ -24277,15 +30662,33 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObjec
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
+    PyObject * obj6 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyTextShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyTextShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (bool) SWIG_AsBool(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        arg7 = (int) SWIG_AsInt(obj6); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7);
@@ -24310,13 +30713,31 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, Py
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyTextShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -24341,13 +30762,31 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg6 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyTextShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        arg6 = (int) SWIG_AsInt(obj5); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6);
@@ -24368,12 +30807,19 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *ar
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyTextShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -24394,12 +30840,19 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
      double arg2 ;
      double arg3 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "w",(char *) "h", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyTextShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -24458,10 +30911,13 @@ static PyObject *_wrap_Diagram_AddShape(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Diagram_AddShape",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Diagram_AddShape",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj2) {
      if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24488,10 +30944,14 @@ static PyObject *_wrap_Diagram_Clear(PyObject *self, PyObject *args, PyObject *k
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_Clear",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_Clear",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24516,7 +30976,8 @@ static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_DeleteAllShapes",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_DeleteAllShapes",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DeleteAllShapes();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DeleteAllShapes();
@@ -24541,16 +31002,32 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObj
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      double arg6 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "dc",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:Diagram_DrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Diagram_DrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      }
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (double) SWIG_AsDouble(obj4); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg6 = (double) SWIG_AsDouble(obj5); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawOutline(*arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawOutline(*arg2,arg3,arg4,arg5,arg6);
@@ -24571,12 +31048,16 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObjec
      long arg2 ;
      wxPyShape *result;
      PyObject * obj0 = 0 ;
      long arg2 ;
      wxPyShape *result;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "id", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "id", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Diagram_FindShape",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_FindShape",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (long) SWIG_AsLong(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->FindShape(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->FindShape(arg2);
@@ -24603,7 +31084,8 @@ static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetCanvas",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetCanvas",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeCanvas *)(arg1)->GetCanvas();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShapeCanvas *)(arg1)->GetCanvas();
@@ -24630,7 +31112,8 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetCount",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetCount",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetCount();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetCount();
@@ -24638,7 +31121,7 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24655,7 +31138,8 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetGridSpacing",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetGridSpacing",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetGridSpacing();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (double)(arg1)->GetGridSpacing();
@@ -24663,7 +31147,7 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyFloat_FromDouble(result);
+    resultobj = SWIG_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24680,7 +31164,8 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetMouseTolerance",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetMouseTolerance",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetMouseTolerance();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetMouseTolerance();
@@ -24688,7 +31173,7 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    resultobj = SWIG_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24705,7 +31190,8 @@ static PyObject *_wrap_Diagram_GetShapeList(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetShapeList",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetShapeList",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxDiagram_GetShapeList(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (PyObject *)wxDiagram_GetShapeList(arg1);
@@ -24730,7 +31216,8 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetQuickEditMode",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetQuickEditMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetQuickEditMode();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetQuickEditMode();
@@ -24738,7 +31225,9 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args,
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24755,7 +31244,8 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetSnapToGrid",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetSnapToGrid",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetSnapToGrid();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetSnapToGrid();
@@ -24763,7 +31253,9 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24781,8 +31273,10 @@ static PyObject *_wrap_Diagram_InsertShape(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_InsertShape",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_InsertShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->InsertShape(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->InsertShape(arg2);
@@ -24808,10 +31302,14 @@ static PyObject *_wrap_Diagram_RecentreAll(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_RecentreAll",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_RecentreAll",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24838,10 +31336,14 @@ static PyObject *_wrap_Diagram_Redraw(PyObject *self, PyObject *args, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_Redraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_Redraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24866,7 +31368,8 @@ static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *self, PyObject *args, P
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_RemoveAllShapes",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_RemoveAllShapes",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveAllShapes();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveAllShapes();
@@ -24892,8 +31395,10 @@ static PyObject *_wrap_Diagram_RemoveShape(PyObject *self, PyObject *args, PyObj
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_RemoveShape",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_RemoveShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveShape(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveShape(arg2);
@@ -24919,8 +31424,10 @@ static PyObject *_wrap_Diagram_SetCanvas(PyObject *self, PyObject *args, PyObjec
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetCanvas",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetCanvas",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCanvas(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCanvas(arg2);
@@ -24940,12 +31447,16 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, Py
      wxDiagram *arg1 = (wxDiagram *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
      wxDiagram *arg1 = (wxDiagram *) 0 ;
      double arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "spacing", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "spacing", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Diagram_SetGridSpacing",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetGridSpacing",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetGridSpacing(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetGridSpacing(arg2);
@@ -24965,12 +31476,16 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args,
      wxDiagram *arg1 = (wxDiagram *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
      wxDiagram *arg1 = (wxDiagram *) 0 ;
      int arg2 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "tolerance", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "tolerance", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Diagram_SetMouseTolerance",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetMouseTolerance",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int) SWIG_AsInt(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMouseTolerance(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMouseTolerance(arg2);
@@ -24996,8 +31511,9 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetQuickEditMode",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetQuickEditMode",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25024,8 +31540,9 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyO
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetSnapToGrid",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetSnapToGrid",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25052,8 +31569,9 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_ShowAll",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_ShowAll",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25084,7 +31602,8 @@ static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kw
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Diagram_Snap",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Diagram_Snap",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          temp2 = PyFloat_AsDouble(obj1);
          if (PyErr_Occurred()) SWIG_fail;
      {
          temp2 = PyFloat_AsDouble(obj1);
          if (PyErr_Occurred()) SWIG_fail;
@@ -25140,16 +31659,23 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
      wxSize temp4 ;
      bool temp6 = False ;
      PyObject * obj0 = 0 ;
      wxSize temp4 ;
      bool temp6 = False ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
      };
      
      PyObject * obj5 = 0 ;
      char *kwnames[] = {
          (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiOOlO:new_PyShapeCanvas",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_PyShapeCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
      if (obj0) {
      if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    }
+    if (obj1) {
+        arg2 = (int) SWIG_AsInt(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
      }
      if (obj2) {
          {
      }
      if (obj2) {
          {
@@ -25163,6 +31689,10 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
              if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail;
          }
      }
              if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail;
          }
      }
+    if (obj4) {
+        arg5 = (long) SWIG_AsLong(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if (obj5) {
          {
              arg6 = wxString_in_helper(obj5);
      if (obj5) {
          {
              arg6 = wxString_in_helper(obj5);
@@ -25207,7 +31737,8 @@ static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeCanvas__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeCanvas__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      arg2 = obj1;
      arg3 = obj2;
      {
      arg2 = obj1;
      arg3 = obj2;
      {
@@ -25237,10 +31768,13 @@ static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *self, PyObject *args, Py
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeCanvas_AddShape",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeCanvas_AddShape",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      if (obj2) {
      if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25267,6 +31801,8 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P
      wxPyShape *result;
      int temp4 ;
      PyObject * obj0 = 0 ;
      wxPyShape *result;
      int temp4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
      PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
      PyObject * obj3 = 0 ;
      PyObject * obj4 = 0 ;
      char *kwnames[] = {
@@ -25274,13 +31810,20 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P
      };
      
      arg4 = &temp4;
      };
      
      arg4 = &temp4;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
      if (obj3) {
      if (obj3) {
-        if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxClassInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj3,(void **)(&arg5),SWIGTYPE_p_wxClassInfo,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      if (obj4) {
      }
      if (obj4) {
-        if ((SWIG_ConvertPtr(obj4,(void **) &arg6, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if ((SWIG_ConvertPtr(obj4,(void **)(&arg6),SWIGTYPE_p_wxPyShape,
+        SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25312,13 +31855,23 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO
      wxPyShape *result;
      int temp4 ;
      PyObject * obj0 = 0 ;
      wxPyShape *result;
      int temp4 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x1",(char *) "y",(char *) "op", NULL 
      };
      
      arg4 = &temp4;
      char *kwnames[] = {
          (char *) "self",(char *) "x1",(char *) "y",(char *) "op", NULL 
      };
      
      arg4 = &temp4;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oddi:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&arg2,&arg3,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = (int) SWIG_AsInt(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->FindFirstSensitiveShape(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->FindFirstSensitiveShape(arg2,arg3,arg4,arg5);
@@ -25349,7 +31902,8 @@ static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeCanvas_GetDiagram",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeCanvas_GetDiagram",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxDiagram *)(arg1)->GetDiagram();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxDiagram *)(arg1)->GetDiagram();
@@ -25376,7 +31930,8 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject *
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeCanvas_GetQuickEditMode",kwnames,&obj0)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeCanvas_GetQuickEditMode",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetQuickEditMode();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->GetQuickEditMode();
@@ -25384,7 +31939,9 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject *
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -25402,8 +31959,10 @@ static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_InsertShape",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_InsertShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->InsertShape(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->InsertShape(arg2);
@@ -25425,12 +31984,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObje
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4);
@@ -25452,12 +32023,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObj
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginDragRight(arg2,arg3,arg4);
@@ -25479,12 +32062,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragLeft(arg2,arg3,arg4);
@@ -25506,12 +32101,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObjec
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndDragRight(arg2,arg3,arg4);
@@ -25535,14 +32142,26 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *a
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|i:PyShapeCanvas_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5);
@@ -25566,14 +32185,26 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject *
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      int arg5 = (int) 0 ;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|i:PyShapeCanvas_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (bool) SWIG_AsBool(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
      if (PyErr_Occurred()) SWIG_fail;
      if (PyErr_Occurred()) SWIG_fail;
+    arg4 = (double) SWIG_AsDouble(obj3); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj4) {
+        arg5 = (int) SWIG_AsInt(obj4); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5);
@@ -25595,12 +32226,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject *
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnLeftClick(arg2,arg3,arg4);
@@ -25622,12 +32265,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
      double arg3 ;
      int arg4 = (int) 0 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (double) SWIG_AsDouble(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    arg3 = (double) SWIG_AsDouble(obj2); 
+    if (PyErr_Occurred()) SWIG_fail;
+    if (obj3) {
+        arg4 = (int) SWIG_AsInt(obj3); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnRightClick(arg2,arg3,arg4);
@@ -25653,10 +32308,14 @@ static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *self, PyObject *args, PyOb
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_Redraw",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_Redraw",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
+    SWIG_POINTER_EXCEPTION | 0)) == -1)
+    SWIG_fail;
      if (arg2 == NULL) {
      if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        PyErr_SetString(PyExc_TypeError,"null reference");
+        SWIG_fail;
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25683,8 +32342,10 @@ static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_RemoveShape",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_RemoveShape",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveShape(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->RemoveShape(arg2);
@@ -25710,8 +32371,10 @@ static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *self, PyObject *args,
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_SetDiagram",kwnames,&obj0,&obj1)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_SetDiagram",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDiagram,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDiagram(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDiagram(arg2);
@@ -25741,7 +32404,8 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObje
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeCanvas_Snap",kwnames,&obj0,&obj1,&obj2)) goto fail;
      };
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeCanvas_Snap",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
      {
          temp2 = PyFloat_AsDouble(obj1);
          if (PyErr_Occurred()) SWIG_fail;
      {
          temp2 = PyFloat_AsDouble(obj1);
          if (PyErr_Occurred()) SWIG_fail;
@@ -25854,6 +32518,14 @@ static PyMethodDef SwigMethods[] = {
          { (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 *)"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 *)"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 },
@@ -25995,6 +32667,7 @@ static PyMethodDef SwigMethods[] = {
          { (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_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_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 },
@@ -26023,6 +32696,7 @@ static PyMethodDef SwigMethods[] = {
          { (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_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_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 },
@@ -26103,6 +32777,7 @@ static PyMethodDef SwigMethods[] = {
          { (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 *)"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_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 },
@@ -26527,6 +33202,12 @@ static PyMethodDef SwigMethods[] = {
          { (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_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_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 },
@@ -26563,6 +33244,11 @@ static PyMethodDef SwigMethods[] = {
          { (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_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_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 },
@@ -26686,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_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));
  }
  static void *_p_wxPyVListBoxTo_p_wxPanel(void *x) {
      return (void *)((wxPanel *) (wxPyVScrolledWindow *) ((wxPyVListBox *) x));
  }
@@ -26707,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_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));
  }
  static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) {
      return (void *)((wxScrolledWindow *)  ((wxPreviewCanvas *) x));
  }
@@ -26785,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_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));
  }
  static void *_p_wxControlTo_p_wxWindow(void *x) {
      return (void *)((wxWindow *)  ((wxControl *) x));
  }
@@ -27190,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_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));
  }
  static void *_p_wxSashEventTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxSashEvent *) x));
  }
@@ -27220,6 +33918,9 @@ static void *_p_wxPageSetupDialogTo_p_wxObject(void *x) {
  static void *_p_wxPrintDialogTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxPrintDialog *) x));
  }
  static void *_p_wxPrintDialogTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxPrintDialog *) x));
  }
+static void *_p_wxAttachmentPointTo_p_wxObject(void *x) {
+    return (void *)((wxObject *)  ((wxAttachmentPoint *) x));
+}
  static void *_p_wxPyShapeTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxPyShapeEvtHandler *) ((wxPyShape *) x));
  }
  static void *_p_wxPyShapeTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxPyShapeEvtHandler *) ((wxPyShape *) x));
  }
@@ -27421,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_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));
  }
  static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
      return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
  }
@@ -27550,46 +34254,47 @@ static void *_p_wxPyDividedShapeTo_p_wxPyRectangleShape(void *x) {
  static void *_p_wxPyDivisionShapeTo_p_wxPyCompositeShape(void *x) {
      return (void *)((wxPyCompositeShape *)  ((wxPyDivisionShape *) x));
  }
  static void *_p_wxPyDivisionShapeTo_p_wxPyCompositeShape(void *x) {
      return (void *)((wxPyCompositeShape *)  ((wxPyDivisionShape *) x));
  }
-static swig_type_info _swigt__p_wxOGLConstraint[] = {{"_p_wxOGLConstraint", 0, "wxOGLConstraint *", 0},{"_p_wxOGLConstraint"},{0}};
-static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0},{"_p_wxBrush"},{0}};
-static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}};
-static swig_type_info _swigt__p_wxShapeRegion[] = {{"_p_wxShapeRegion", 0, "wxShapeRegion *", 0},{"_p_wxShapeRegion"},{0}};
-static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}};
-static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0},{"_p_wxRealPoint"},{0}};
-static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, "wxPyControlPoint *", 0},{"_p_wxPyControlPoint"},{0}};
-static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0},{"_p_wxArrowHead"},{0}};
-static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0},{"_p_wxStringList"},{0}};
-static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}};
-static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0},{"_p_bool"},{0}};
-static swig_type_info _swigt__p_wxList[] = {{"_p_wxList", 0, "wxList *", 0},{"_p_wxList"},{0}};
-static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}};
-static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow},{0}};
-static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}};
-static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}};
-static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0},{"_p_wxPyDivisionShape"},{0}};
-static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0},{"_p_wxPyDrawnShape"},{0}};
-static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0},{"_p_wxPyPolygonShape"},{0}};
-static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}};
-static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject},{0}};
-static swig_type_info _swigt__p_wxPyBitmapShape[] = {{"_p_wxPyBitmapShape", 0, "wxPyBitmapShape *", 0},{"_p_wxPyBitmapShape"},{0}};
-static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}};
-static swig_type_info _swigt__p_wxPyShapeEvtHandler[] = {{"_p_wxPyShapeEvtHandler", 0, "wxPyShapeEvtHandler *", 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShapeEvtHandler},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyShapeEvtHandler"},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShapeEvtHandler},{0}};
-static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{0}};
-static swig_type_info _swigt__p_wxPyEllipseShape[] = {{"_p_wxPyEllipseShape", 0, "wxPyEllipseShape *", 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyEllipseShape},{"_p_wxPyEllipseShape"},{0}};
-static swig_type_info _swigt__p_wxPyShapeCanvas[] = {{"_p_wxPyShapeCanvas", 0, "wxPyShapeCanvas *", 0},{"_p_wxPyShapeCanvas"},{0}};
-static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}};
-static swig_type_info _swigt__p_wxDiagram[] = {{"_p_wxDiagram", 0, "wxDiagram *", 0},{"_p_wxDiagram"},{0}};
-static swig_type_info _swigt__p_wxPyShape[] = {{"_p_wxPyShape", 0, "wxPyShape *", 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShape},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShape},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShape},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShape},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShape},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShape},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShape},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShape},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShape},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShape},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShape},{"_p_wxPyShape"},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShape},{0}};
-static swig_type_info _swigt__p_wxClassInfo[] = {{"_p_wxClassInfo", 0, "wxClassInfo *", 0},{"_p_wxClassInfo"},{0}};
-static swig_type_info _swigt__p_wxPyLineShape[] = {{"_p_wxPyLineShape", 0, "wxPyLineShape *", 0},{"_p_wxPyLineShape"},{0}};
-static swig_type_info _swigt__p_wxPyRectangleShape[] = {{"_p_wxPyRectangleShape", 0, "wxPyRectangleShape *", 0},{"_p_wxPyRectangleShape"},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyRectangleShape},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyRectangleShape},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyRectangleShape},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyRectangleShape},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyRectangleShape},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyRectangleShape},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyRectangleShape},{0}};
-static swig_type_info _swigt__p_wxPyCompositeShape[] = {{"_p_wxPyCompositeShape", 0, "wxPyCompositeShape *", 0},{"_p_wxPyCompositeShape"},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyCompositeShape},{0}};
-static swig_type_info _swigt__p_wxPyCircleShape[] = {{"_p_wxPyCircleShape", 0, "wxPyCircleShape *", 0},{"_p_wxPyCircleShape"},{0}};
-static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0},{"_p_wxPen"},{0}};
-static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}};
-static swig_type_info _swigt__p_wxPseudoMetaFile[] = {{"_p_wxPseudoMetaFile", 0, "wxPseudoMetaFile *", 0},{"_p_wxPseudoMetaFile"},{0}};
-static swig_type_info _swigt__p_wxPyTextShape[] = {{"_p_wxPyTextShape", 0, "wxPyTextShape *", 0},{"_p_wxPyTextShape"},{0}};
-static swig_type_info _swigt__p_wxPyDividedShape[] = {{"_p_wxPyDividedShape", 0, "wxPyDividedShape *", 0},{"_p_wxPyDividedShape"},{0}};
+static swig_type_info _swigt__p_wxOGLConstraint[] = {{"_p_wxOGLConstraint", 0, "wxOGLConstraint *", 0, 0, 0, 0},{"_p_wxOGLConstraint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0, 0, 0, 0},{"_p_wxBrush", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxShapeRegion[] = {{"_p_wxShapeRegion", 0, "wxShapeRegion *", 0, 0, 0, 0},{"_p_wxShapeRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0, 0, 0, 0},{"_p_wxRealPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, "wxPyControlPoint *", 0, 0, 0, 0},{"_p_wxPyControlPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 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_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_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_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_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}};
+static swig_type_info _swigt__p_wxDiagram[] = {{"_p_wxDiagram", 0, "wxDiagram *", 0, 0, 0, 0},{"_p_wxDiagram", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyShape[] = {{"_p_wxPyShape", 0, "wxPyShape *", 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxAttachmentPoint[] = {{"_p_wxAttachmentPoint", 0, "wxAttachmentPoint *", 0, 0, 0, 0},{"_p_wxAttachmentPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxClassInfo[] = {{"_p_wxClassInfo", 0, "wxClassInfo *", 0, 0, 0, 0},{"_p_wxClassInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyLineShape[] = {{"_p_wxPyLineShape", 0, "wxPyLineShape *", 0, 0, 0, 0},{"_p_wxPyLineShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyRectangleShape[] = {{"_p_wxPyRectangleShape", 0, "wxPyRectangleShape *", 0, 0, 0, 0},{"_p_wxPyRectangleShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyCompositeShape[] = {{"_p_wxPyCompositeShape", 0, "wxPyCompositeShape *", 0, 0, 0, 0},{"_p_wxPyCompositeShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyCompositeShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyCircleShape[] = {{"_p_wxPyCircleShape", 0, "wxPyCircleShape *", 0, 0, 0, 0},{"_p_wxPyCircleShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0, 0, 0, 0},{"_p_wxPen", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPseudoMetaFile[] = {{"_p_wxPseudoMetaFile", 0, "wxPseudoMetaFile *", 0, 0, 0, 0},{"_p_wxPseudoMetaFile", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyTextShape[] = {{"_p_wxPyTextShape", 0, "wxPyTextShape *", 0, 0, 0, 0},{"_p_wxPyTextShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPyDividedShape[] = {{"_p_wxPyDividedShape", 0, "wxPyDividedShape *", 0, 0, 0, 0},{"_p_wxPyDividedShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
  
  static swig_type_info *swig_types_initial[] = {
  _swigt__p_wxOGLConstraint, 
  
  static swig_type_info *swig_types_initial[] = {
  _swigt__p_wxOGLConstraint, 
@@ -27600,6 +34305,7 @@ _swigt__p_wxDC,
  _swigt__p_wxRealPoint, 
  _swigt__p_wxPyControlPoint, 
  _swigt__p_wxArrowHead, 
  _swigt__p_wxRealPoint, 
  _swigt__p_wxPyControlPoint, 
  _swigt__p_wxArrowHead, 
+_swigt__p_char, 
  _swigt__p_wxStringList, 
  _swigt__p_wxPanel, 
  _swigt__p_bool, 
  _swigt__p_wxStringList, 
  _swigt__p_wxPanel, 
  _swigt__p_bool, 
@@ -27614,7 +34320,6 @@ _swigt__p_wxPyPolygonShape,
  _swigt__p_wxBitmap, 
  _swigt__p_wxObject, 
  _swigt__p_wxPyBitmapShape, 
  _swigt__p_wxBitmap, 
  _swigt__p_wxObject, 
  _swigt__p_wxPyBitmapShape, 
-_swigt__p_wxString, 
  _swigt__p_wxPyShapeEvtHandler, 
  _swigt__p_wxEvtHandler, 
  _swigt__p_wxPyEllipseShape, 
  _swigt__p_wxPyShapeEvtHandler, 
  _swigt__p_wxEvtHandler, 
  _swigt__p_wxPyEllipseShape, 
@@ -27622,6 +34327,7 @@ _swigt__p_wxPyShapeCanvas,
  _swigt__p_wxPoint, 
  _swigt__p_wxDiagram, 
  _swigt__p_wxPyShape, 
  _swigt__p_wxPoint, 
  _swigt__p_wxDiagram, 
  _swigt__p_wxPyShape, 
+_swigt__p_wxAttachmentPoint, 
  _swigt__p_wxClassInfo, 
  _swigt__p_wxPyLineShape, 
  _swigt__p_wxPyRectangleShape, 
  _swigt__p_wxClassInfo, 
  _swigt__p_wxPyLineShape, 
  _swigt__p_wxPyRectangleShape, 
@@ -27639,70 +34345,6 @@ _swigt__p_wxPyDividedShape,
  /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
  
  static swig_const_info swig_const_table[] = {
  /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
  
  static swig_const_info swig_const_table[] = {
-{ SWIG_PY_INT,     (char *)"oglMETAFLAGS_OUTLINE", (long) oglMETAFLAGS_OUTLINE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"oglMETAFLAGS_ATTACHMENTS", (long) oglMETAFLAGS_ATTACHMENTS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"KEY_SHIFT", (long) KEY_SHIFT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"KEY_CTRL", (long) KEY_CTRL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_NONE", (long) ARROW_NONE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_END", (long) ARROW_END, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_BOTH", (long) ARROW_BOTH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_MIDDLE", (long) ARROW_MIDDLE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_START", (long) ARROW_START, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_HOLLOW_CIRCLE", (long) ARROW_HOLLOW_CIRCLE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_FILLED_CIRCLE", (long) ARROW_FILLED_CIRCLE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_ARROW", (long) ARROW_ARROW, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_SINGLE_OBLIQUE", (long) ARROW_SINGLE_OBLIQUE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_DOUBLE_OBLIQUE", (long) ARROW_DOUBLE_OBLIQUE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_METAFILE", (long) ARROW_METAFILE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_POSITION_END", (long) ARROW_POSITION_END, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ARROW_POSITION_START", (long) ARROW_POSITION_START, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"CONTROL_POINT_VERTICAL", (long) CONTROL_POINT_VERTICAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"CONTROL_POINT_HORIZONTAL", (long) CONTROL_POINT_HORIZONTAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"CONTROL_POINT_DIAGONAL", (long) CONTROL_POINT_DIAGONAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"CONTROL_POINT_ENDPOINT_TO", (long) CONTROL_POINT_ENDPOINT_TO, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"CONTROL_POINT_ENDPOINT_FROM", (long) CONTROL_POINT_ENDPOINT_FROM, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"CONTROL_POINT_LINE", (long) CONTROL_POINT_LINE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FORMAT_NONE", (long) FORMAT_NONE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FORMAT_CENTRE_HORIZ", (long) FORMAT_CENTRE_HORIZ, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FORMAT_CENTRE_VERT", (long) FORMAT_CENTRE_VERT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"FORMAT_SIZE_TO_CONTENTS", (long) FORMAT_SIZE_TO_CONTENTS, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LINE_ALIGNMENT_HORIZ", (long) LINE_ALIGNMENT_HORIZ, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LINE_ALIGNMENT_VERT", (long) LINE_ALIGNMENT_VERT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LINE_ALIGNMENT_TO_NEXT_HANDLE", (long) LINE_ALIGNMENT_TO_NEXT_HANDLE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"LINE_ALIGNMENT_NONE", (long) LINE_ALIGNMENT_NONE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"SHADOW_NONE", (long) SHADOW_NONE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"SHADOW_LEFT", (long) SHADOW_LEFT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"SHADOW_RIGHT", (long) SHADOW_RIGHT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"OP_CLICK_LEFT", (long) OP_CLICK_LEFT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"OP_CLICK_RIGHT", (long) OP_CLICK_RIGHT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"OP_DRAG_LEFT", (long) OP_DRAG_LEFT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"OP_DRAG_RIGHT", (long) OP_DRAG_RIGHT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"OP_ALL", (long) OP_ALL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ATTACHMENT_MODE_NONE", (long) ATTACHMENT_MODE_NONE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ATTACHMENT_MODE_EDGE", (long) ATTACHMENT_MODE_EDGE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"ATTACHMENT_MODE_BRANCHING", (long) ATTACHMENT_MODE_BRANCHING, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"BRANCHING_ATTACHMENT_NORMAL", (long) BRANCHING_ATTACHMENT_NORMAL, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"BRANCHING_ATTACHMENT_BLOB", (long) BRANCHING_ATTACHMENT_BLOB, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_CENTRED_VERTICALLY", (long) gyCONSTRAINT_CENTRED_VERTICALLY, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_CENTRED_HORIZONTALLY", (long) gyCONSTRAINT_CENTRED_HORIZONTALLY, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_CENTRED_BOTH", (long) gyCONSTRAINT_CENTRED_BOTH, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_LEFT_OF", (long) gyCONSTRAINT_LEFT_OF, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_RIGHT_OF", (long) gyCONSTRAINT_RIGHT_OF, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_ABOVE", (long) gyCONSTRAINT_ABOVE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_BELOW", (long) gyCONSTRAINT_BELOW, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_ALIGNED_TOP", (long) gyCONSTRAINT_ALIGNED_TOP, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_ALIGNED_BOTTOM", (long) gyCONSTRAINT_ALIGNED_BOTTOM, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_ALIGNED_LEFT", (long) gyCONSTRAINT_ALIGNED_LEFT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_ALIGNED_RIGHT", (long) gyCONSTRAINT_ALIGNED_RIGHT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_MIDALIGNED_TOP", (long) gyCONSTRAINT_MIDALIGNED_TOP, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_MIDALIGNED_BOTTOM", (long) gyCONSTRAINT_MIDALIGNED_BOTTOM, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_MIDALIGNED_LEFT", (long) gyCONSTRAINT_MIDALIGNED_LEFT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"gyCONSTRAINT_MIDALIGNED_RIGHT", (long) gyCONSTRAINT_MIDALIGNED_RIGHT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"DIVISION_SIDE_NONE", (long) DIVISION_SIDE_NONE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"DIVISION_SIDE_LEFT", (long) DIVISION_SIDE_LEFT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"DIVISION_SIDE_TOP", (long) DIVISION_SIDE_TOP, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"DIVISION_SIDE_RIGHT", (long) DIVISION_SIDE_RIGHT, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"DIVISION_SIDE_BOTTOM", (long) DIVISION_SIDE_BOTTOM, 0, 0, 0},
  {0}};
  
  #ifdef __cplusplus
  {0}};
  
  #ifdef __cplusplus
@@ -27729,6 +34371,70 @@ SWIGEXPORT(void) SWIG_init(void) {
      }
      SWIG_InstallConstants(d,swig_const_table);
      
      }
      SWIG_InstallConstants(d,swig_const_table);
      
+    PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_FromInt((int)oglMETAFLAGS_OUTLINE));
+    PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_FromInt((int)oglMETAFLAGS_ATTACHMENTS));
+    PyDict_SetItemString(d,"KEY_SHIFT", SWIG_FromInt((int)KEY_SHIFT));
+    PyDict_SetItemString(d,"KEY_CTRL", SWIG_FromInt((int)KEY_CTRL));
+    PyDict_SetItemString(d,"ARROW_NONE", SWIG_FromInt((int)ARROW_NONE));
+    PyDict_SetItemString(d,"ARROW_END", SWIG_FromInt((int)ARROW_END));
+    PyDict_SetItemString(d,"ARROW_BOTH", SWIG_FromInt((int)ARROW_BOTH));
+    PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_FromInt((int)ARROW_MIDDLE));
+    PyDict_SetItemString(d,"ARROW_START", SWIG_FromInt((int)ARROW_START));
+    PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_FromInt((int)ARROW_HOLLOW_CIRCLE));
+    PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_FromInt((int)ARROW_FILLED_CIRCLE));
+    PyDict_SetItemString(d,"ARROW_ARROW", SWIG_FromInt((int)ARROW_ARROW));
+    PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_FromInt((int)ARROW_SINGLE_OBLIQUE));
+    PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_FromInt((int)ARROW_DOUBLE_OBLIQUE));
+    PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_FromInt((int)ARROW_METAFILE));
+    PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_FromInt((int)ARROW_POSITION_END));
+    PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_FromInt((int)ARROW_POSITION_START));
+    PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_FromInt((int)CONTROL_POINT_VERTICAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_FromInt((int)CONTROL_POINT_HORIZONTAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_FromInt((int)CONTROL_POINT_DIAGONAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_TO));
+    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_FROM));
+    PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_FromInt((int)CONTROL_POINT_LINE));
+    PyDict_SetItemString(d,"FORMAT_NONE", SWIG_FromInt((int)FORMAT_NONE));
+    PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_FromInt((int)FORMAT_CENTRE_HORIZ));
+    PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_FromInt((int)FORMAT_CENTRE_VERT));
+    PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_FromInt((int)FORMAT_SIZE_TO_CONTENTS));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_FromInt((int)LINE_ALIGNMENT_HORIZ));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_FromInt((int)LINE_ALIGNMENT_VERT));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_FromInt((int)LINE_ALIGNMENT_NONE));
+    PyDict_SetItemString(d,"SHADOW_NONE", SWIG_FromInt((int)SHADOW_NONE));
+    PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_FromInt((int)SHADOW_LEFT));
+    PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_FromInt((int)SHADOW_RIGHT));
+    PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_FromInt((int)OP_CLICK_LEFT));
+    PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_FromInt((int)OP_CLICK_RIGHT));
+    PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_FromInt((int)OP_DRAG_LEFT));
+    PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_FromInt((int)OP_DRAG_RIGHT));
+    PyDict_SetItemString(d,"OP_ALL", SWIG_FromInt((int)OP_ALL));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_FromInt((int)ATTACHMENT_MODE_NONE));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_FromInt((int)ATTACHMENT_MODE_EDGE));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_FromInt((int)ATTACHMENT_MODE_BRANCHING));
+    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_FromInt((int)BRANCHING_ATTACHMENT_NORMAL));
+    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_FromInt((int)BRANCHING_ATTACHMENT_BLOB));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_BOTH));
+    PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_FromInt((int)gyCONSTRAINT_LEFT_OF));
+    PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_FromInt((int)gyCONSTRAINT_RIGHT_OF));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_FromInt((int)gyCONSTRAINT_ABOVE));
+    PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_FromInt((int)gyCONSTRAINT_BELOW));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_TOP));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_FromInt((int)DIVISION_SIDE_NONE));
+    PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_FromInt((int)DIVISION_SIDE_LEFT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_FromInt((int)DIVISION_SIDE_TOP));
+    PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_FromInt((int)DIVISION_SIDE_RIGHT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_FromInt((int)DIVISION_SIDE_BOTTOM));
      
      
      //     initoglbasicc();
      
      
      //     initoglbasicc();