reSWIGged

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

index 5b40b524219e86fadd3b23002095c101b6427544..c78e9eaf7a85548ed05f1e3958daf60cede039e9 100644 (file)
--- a/wxPython/contrib/ogl/msw/ogl_wrap.cpp
+++ b/wxPython/contrib/ogl/msw/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
@@ -45,6 +45,8 @@ private:
  #define SWIG_TypeName        SWIG_Python_TypeName
  #define SWIG_TypeQuery       SWIG_Python_TypeQuery
  #define SWIG_TypeClientData  SWIG_Python_TypeClientData
  #define SWIG_TypeName        SWIG_Python_TypeName
  #define SWIG_TypeQuery       SWIG_Python_TypeQuery
  #define SWIG_TypeClientData  SWIG_Python_TypeClientData
+#define SWIG_PackData        SWIG_Python_PackData 
+#define SWIG_UnpackData      SWIG_Python_UnpackData 
  
  
  /***********************************************************************
  
  
  /***********************************************************************
@@ -59,36 +61,35 @@ private:
  
  #include <string.h>
  
  
  #include <string.h>
  
-#if defined(_WIN32) || defined(__WIN32__)
-#       if defined(_MSC_VER)
-#               if defined(STATIC_LINKED)
-#                       define SWIGEXPORT(a) a
-#                       define SWIGIMPORT(a) extern a
-#               else
-#                       define SWIGEXPORT(a) __declspec(dllexport) a
-#                       define SWIGIMPORT(a) extern a
-#               endif
-#       else
-#               if defined(__BORLANDC__)
-#                       define SWIGEXPORT(a) a _export
-#                       define SWIGIMPORT(a) a _export
-#               else
-#                       define SWIGEXPORT(a) a
-#                       define SWIGIMPORT(a) a
-#               endif
-#       endif
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#  if defined(_MSC_VER) || defined(__GNUC__)
+#    if defined(STATIC_LINKED)
+#      define SWIGEXPORT(a) a
+#      define SWIGIMPORT(a) extern a
+#    else
+#      define SWIGEXPORT(a) __declspec(dllexport) a
+#      define SWIGIMPORT(a) extern a
+#    endif
+#  else
+#    if defined(__BORLANDC__)
+#      define SWIGEXPORT(a) a _export
+#      define SWIGIMPORT(a) a _export
+#    else
+#      define SWIGEXPORT(a) a
+#      define SWIGIMPORT(a) a
+#    endif
+#  endif
  #else
  #else
-#       define SWIGEXPORT(a) a
-#       define SWIGIMPORT(a) a
+#  define SWIGEXPORT(a) a
+#  define SWIGIMPORT(a) a
  #endif
  
  #ifdef SWIG_GLOBAL
  #endif
  
  #ifdef SWIG_GLOBAL
-#define SWIGRUNTIME(a) SWIGEXPORT(a)
+#  define SWIGRUNTIME(a) SWIGEXPORT(a)
  #else
  #else
-#define SWIGRUNTIME(a) static a
+#  define SWIGRUNTIME(a) static a
  #endif
  
  #endif
  
-
  #ifdef __cplusplus
  extern "C" {
  #endif
  #ifdef __cplusplus
  extern "C" {
  #endif
@@ -97,10 +98,10 @@ typedef void *(*swig_converter_func)(void *);
  typedef struct swig_type_info *(*swig_dycast_func)(void **);
  
  typedef struct swig_type_info {
  typedef struct swig_type_info *(*swig_dycast_func)(void **);
  
  typedef struct swig_type_info {
-  const char             *name;                 
+  const char             *name;
    swig_converter_func     converter;
    const char             *str;
    swig_converter_func     converter;
    const char             *str;
-  void                   *clientdata;  
+  void                   *clientdata;
    swig_dycast_func        dcast;
    struct swig_type_info  *next;
    struct swig_type_info  *prev;
    swig_dycast_func        dcast;
    struct swig_type_info  *next;
    struct swig_type_info  *prev;
@@ -114,13 +115,15 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
  SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
  SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
  SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
  SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
  SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
  SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
+SWIGIMPORT(char *)           SWIG_PackData(char *, void *, int);
+SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  
  
  #ifdef __cplusplus
  }
  
  
  #ifdef __cplusplus
  }
-
  #endif
  
  #endif
  
+
  /***********************************************************************
   * pyrun.swg for wxPython
   *
  /***********************************************************************
   * pyrun.swg for wxPython
   *
@@ -131,7 +134,6 @@ SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
   *
   ************************************************************************/
  
   *
   ************************************************************************/
  
-
  #include "Python.h"
  
  #ifdef __cplusplus
  #include "Python.h"
  
  #ifdef __cplusplus
@@ -162,8 +164,6 @@ typedef struct swig_const_info {
      swig_type_info **ptype;
  } swig_const_info;
  
      swig_type_info **ptype;
  } swig_const_info;
  
-
-
  /* Common SWIG API */
  #define SWIG_ConvertPtr(obj, pp, type, flags) \
    SWIG_Python_ConvertPtr(obj, pp, type, flags)
  /* Common SWIG API */
  #define SWIG_ConvertPtr(obj, pp, type, flags) \
    SWIG_Python_ConvertPtr(obj, pp, type, flags)
@@ -171,7 +171,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()
@@ -179,34 +179,49 @@ typedef struct swig_const_info {
    SWIG_Python_addvarlink(p, name, get_attr, set_attr)
  #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \
    SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
    SWIG_Python_addvarlink(p, name, get_attr, set_attr)
  #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \
    SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
-#define SWIG_PackData(c, ptr, sz) \
-  SWIG_Python_PackData(c, ptr, sz)
-#define SWIG_UnpackData(c, ptr, sz) \
-  SWIG_Python_UnpackData(c, ptr, sz)
  #define SWIG_NewPackedObj(ptr, sz, type) \
    SWIG_Python_NewPackedObj(ptr, sz, type)
  #define SWIG_InstallConstants(d, constants) \
    SWIG_Python_InstallConstants(d, constants)
  
  #define SWIG_NewPackedObj(ptr, sz, type) \
    SWIG_Python_NewPackedObj(ptr, sz, type)
  #define SWIG_InstallConstants(d, constants) \
    SWIG_Python_InstallConstants(d, constants)
  
+typedef double (*py_objasdbl_conv)(PyObject *obj);
  
  
-SWIGEXPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
-SWIGEXPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
-SWIGEXPORT(void *)           SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
+SWIGIMPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
+SWIGIMPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
+SWIGIMPORT(void *)            SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
+SWIGIMPORT(PyObject *)        SWIG_Python_newvarlink(void);
+SWIGIMPORT(void)              SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
+SWIGIMPORT(int)               SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
+SWIGIMPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
+SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
  
  
-SWIGEXPORT(PyObject *)        SWIG_Python_newvarlink(void);
-SWIGEXPORT(void)              SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
-SWIGEXPORT(int)               SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
-SWIGEXPORT(char *)            SWIG_Python_PackData(char *c, void *, int);
-SWIGEXPORT(char *)            SWIG_Python_UnpackData(char *c, void *, int);
-SWIGEXPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
-SWIGEXPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
+/* -----------------------------------------------------------------------------
+ *  the needed conversions between C++ and python
+ * ----------------------------------------------------------------------------- */
+/* basic types */
+/*
+  utilities
+*/
+SWIGIMPORT(char* )         SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info);
+SWIGIMPORT(PyObject *)     SWIG_PyObj_FromCharPtr(const char* cptr);
+SWIGIMPORT(unsigned long)  SWIG_PyObj_AsUnsignedLong(PyObject * obj);
+SWIGIMPORT(long)           SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type,
+                                                   long min_value, long max_value);
+SWIGIMPORT(unsigned long)  SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type,
+                                                           unsigned long max_value);
+SWIGIMPORT(char *)         SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info);
+SWIGIMPORT(void)           SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info,
+                                                      char** cptr, size_t* size);
+SWIGIMPORT(void)           SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info,
+                                                 char* carray, size_t size);
+SWIGIMPORT(PyObject *)     SWIG_PyObj_FromCharArray(const char* carray, size_t size);
+SWIGIMPORT(float)          SWIG_PyObj_AsFloatConv(PyObject *obj,  py_objasdbl_conv pyconv);
  
  
  /* 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
  
-
  #ifdef __cplusplus
  }
  #endif
  #ifdef __cplusplus
  }
  #endif
@@ -223,39 +238,41 @@ SWIGEXPORT(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_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_wxPyDrawnShape swig_types[17] 
  #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_wxPyShapeEvtHandler swig_types[23] 
-#define  SWIGTYPE_p_wxEvtHandler swig_types[24] 
-#define  SWIGTYPE_p_wxPyEllipseShape swig_types[25] 
-#define  SWIGTYPE_p_wxPyShapeCanvas swig_types[26] 
-#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_wxPyDivisionShape 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_wxString swig_types[23] 
+#define  SWIGTYPE_p_wxPyShapeEvtHandler swig_types[24] 
+#define  SWIGTYPE_p_wxEvtHandler swig_types[25] 
+#define  SWIGTYPE_p_wxPyEllipseShape swig_types[26] 
+#define  SWIGTYPE_p_wxPyShapeCanvas swig_types[27] 
+#define  SWIGTYPE_p_wxPoint swig_types[28] 
+#define  SWIGTYPE_p_wxDiagram swig_types[29] 
+#define  SWIGTYPE_p_wxPyShape swig_types[30] 
+#define  SWIGTYPE_p_wxAttachmentPoint swig_types[31] 
+#define  SWIGTYPE_p_wxClassInfo swig_types[32] 
+#define  SWIGTYPE_p_wxPyLineShape swig_types[33] 
+#define  SWIGTYPE_p_wxPyRectangleShape swig_types[34] 
+#define  SWIGTYPE_p_wxPyCompositeShape swig_types[35] 
+#define  SWIGTYPE_p_wxPyCircleShape swig_types[36] 
+#define  SWIGTYPE_p_wxPen swig_types[37] 
+#define  SWIGTYPE_p_int swig_types[38] 
+#define  SWIGTYPE_p_wxPseudoMetaFile swig_types[39] 
+#define  SWIGTYPE_p_wxPyTextShape swig_types[40] 
+#define  SWIGTYPE_p_wxPyDividedShape swig_types[41] 
+static swig_type_info *swig_types[43];
  
  /* -------- TYPES TABLE (END) -------- */
  
  
  /* -------- TYPES TABLE (END) -------- */
  
@@ -267,12 +284,73 @@ static swig_type_info *swig_types[41];
  
  #define SWIG_name    "_ogl"
  
  
  #define SWIG_name    "_ogl"
  
+#include <limits.h>
+#include <float.h>
+#include <string.h>
+
+#ifndef SWIGSTATIC
+#ifdef __cplusplus
+#define SWIGSTATIC(a) static inline a
+#else
+#define SWIGSTATIC(a) static a
+#endif
+#endif
+
+#ifndef numeric_cast
+#ifdef __cplusplus
+#ifdef HAVE_NUMERIC_CAST
+#define numeric_cast(type,a) numeric_cast<type>(a)
+#else
+#define numeric_cast(type,a) static_cast<type>(a)
+#endif
+#else
+#define numeric_cast(type,a) (type)(a)
+#endif
+#endif
+
+
+
+#define SWIG_PyObj_FromSignedChar     PyInt_FromLong
+#define SWIG_PyObj_FromUnsignedChar   PyInt_FromLong
+#define SWIG_PyObj_FromShort         PyInt_FromLong
+#define SWIG_PyObj_FromUnsignedShort  PyInt_FromLong
+#define SWIG_PyObj_FromInt           PyInt_FromLong
+#define SWIG_PyObj_FromLong          PyInt_FromLong
+#define SWIG_PyObj_FromFloat         PyFloat_FromDouble
+#define SWIG_PyObj_FromDouble        PyFloat_FromDouble
+#define SWIG_PyObj_FromFloat         PyFloat_FromDouble
+#define SWIG_PyObj_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"
  
  
-    static const wxString wxPyEmptyString(wxT(""));
+ static const wxString wxPyEmptyString(wxEmptyString); 
+
+SWIGSTATIC(double)
+SWIG_PyObj_AsDouble(PyObject *obj)
+{
+  return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) :
+#if HAVE_LONG_LONG
+    (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj));
+#else
+    (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj));
+#endif
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    PyErr_SetString(PyExc_TypeError, "a double is expected");
+  }
+}
+
+
+SWIGSTATIC(int)
+SWIG_PyObj_AsInt(PyObject *obj)
+{ 
+  return numeric_cast(int,
+    SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX));
+}
  
  
  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
  
  
  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
@@ -308,6 +386,22 @@ void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){
              self->SetClientObject(new wxPyOORClientData(_self));
          }
  
              self->SetClientObject(new wxPyOORClientData(_self));
          }
  
+SWIGSTATIC(bool)
+SWIG_PyObj_AsBool(PyObject *obj)
+{
+  return PyObject_IsTrue(obj) ? true : false;
+}
+
+
+SWIGSTATIC(PyObject*)
+SWIG_PyObj_FromBool(bool value)
+{
+  PyObject *obj = value ? Py_True : Py_False;
+  Py_INCREF(obj);
+  return obj;
+}
+
+
      WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape);
  
  PyObject *wxPyShape_GetChildren(wxPyShape *self){
      WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape);
  
  PyObject *wxPyShape_GetChildren(wxPyShape *self){
@@ -318,10 +412,21 @@ PyObject *wxPyShape_GetLines(wxPyShape *self){
              wxList& list = self->GetLines();
              return wxPy_ConvertShapeList(&list);
          }
              wxList& list = self->GetLines();
              return wxPy_ConvertShapeList(&list);
          }
+
+SWIGSTATIC(long)
+SWIG_PyObj_AsLong(PyObject * obj)
+{
+  return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj);
+}
+
  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);
@@ -438,6 +543,24 @@ PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){
              wxObject*   wxObj;
              wxNode*     node = list->GetFirst();
  
              wxObject*   wxObj;
              wxNode*     node = list->GetFirst();
  
+            wxPyBeginBlockThreads();
+            pyList = PyList_New(0);
+            while (node) {
+                wxObj = node->GetData();
+                pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
+                PyList_Append(pyList, pyObj);
+                node = node->GetNext();
+            }
+            wxPyEndBlockThreads();
+            return pyList;
+        }
+PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
+            wxList* list = self->GetOriginalPoints();
+            PyObject*   pyList;
+            PyObject*   pyObj;
+            wxObject*   wxObj;
+            wxNode*     node = list->GetFirst();
+
              wxPyBeginBlockThreads();
              pyList = PyList_New(0);
              while (node) {
              wxPyBeginBlockThreads();
              pyList = PyList_New(0);
              while (node) {
@@ -739,12 +862,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMinSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMinSize(arg2,arg3);
@@ -765,12 +898,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3);
@@ -791,12 +934,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPosition(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPosition(arg2,arg3);
@@ -817,12 +970,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetProportions(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetProportions(arg2,arg3);
@@ -842,12 +1005,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFormatMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFormatMode(arg2);
@@ -1168,7 +1336,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1240,7 +1408,7 @@ 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 
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
          (char *) "self", NULL 
@@ -1250,12 +1418,16 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          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;
@@ -1339,7 +1511,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1351,12 +1523,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPenStyle(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPenStyle(arg2);
@@ -1454,7 +1631,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1479,7 +1656,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -1517,6 +1694,194 @@ 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_PyObj_AsInt(obj0);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj1) {
+        {
+            arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj2) {
+        {
+            arg3 = (double) SWIG_PyObj_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_PyObj_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_PyObj_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_PyObj_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_PyObj_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_PyObj_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_PyObj_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 ;
@@ -1846,8 +2211,10 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1991,27 +2358,51 @@ 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(!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;
      {
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
-        
-        wxPyEndAllowThreads(__tstate);
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
      double arg2 ;
      PyObject *resultobj;
      wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
      double arg2 ;
@@ -2019,12 +2410,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -2047,12 +2462,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -2073,12 +2512,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -2105,21 +2554,43 @@ 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 * 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_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -2127,7 +2598,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -2145,21 +2616,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -2184,14 +2677,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -2214,12 +2733,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -2242,12 +2785,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -2272,14 +2839,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -2302,12 +2895,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -2330,12 +2947,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -2360,16 +3001,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -2463,8 +3124,10 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2492,15 +3155,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -2525,13 +3214,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -2556,13 +3269,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -2583,12 +3320,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -2609,12 +3356,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -2784,14 +3541,34 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_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);
@@ -2799,7 +3576,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg6));
          resultobj = t_output_helper(resultobj,o);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg6));
          resultobj = t_output_helper(resultobj,o);
@@ -2972,7 +3749,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -2997,7 +3774,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3009,12 +3786,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetX(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetX(arg2);
@@ -3034,12 +3816,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetY(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetY(arg2);
@@ -3196,8 +3983,10 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, Py
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDrawHandles",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDrawHandles(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDrawHandles(arg2);
@@ -3230,7 +4019,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3434,7 +4223,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3480,8 +4269,10 @@ 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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      if (obj1) {
      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 (obj1) {
-        arg2 = PyInt_AsLong(obj1) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      if (obj2) {
          if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj2) {
          if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -3515,12 +4306,16 @@ 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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      if (obj1) {
      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 (obj1) {
-        arg2 = PyInt_AsLong(obj1) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3554,7 +4349,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3579,7 +4374,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3604,7 +4399,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3617,16 +4412,25 @@ 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(!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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj2) {
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3660,7 +4464,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3681,12 +4485,16 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
-    if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj2) {
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDraggable(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDraggable(arg2,arg3);
@@ -3715,10 +4523,14 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFixedSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFixedSize(arg2,arg3);
@@ -3789,7 +4601,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3814,7 +4626,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3833,8 +4645,10 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *arg
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetSpaceAttachments",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpaceAttachments(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpaceAttachments(arg2);
@@ -3867,7 +4681,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3880,17 +4694,24 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj2) {
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetShadowMode(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetShadowMode(arg2,arg3);
@@ -3923,7 +4744,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -3941,14 +4762,24 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_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);
@@ -3956,7 +4787,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      {
          PyObject *o = PyInt_FromLong((long) (*arg4));
          resultobj = t_output_helper(resultobj,o);
      {
          PyObject *o = PyInt_FromLong((long) (*arg4));
          resultobj = t_output_helper(resultobj,o);
@@ -3983,8 +4814,10 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, P
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCentreResize",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCentreResize(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCentreResize(arg2);
@@ -4017,7 +4850,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4036,8 +4869,10 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetMaintainAspectRatio",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMaintainAspectRatio(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMaintainAspectRatio(arg2);
@@ -4070,7 +4905,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4114,8 +4949,10 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, P
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDisableLabel",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDisableLabel(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDisableLabel(arg2);
@@ -4148,7 +4985,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4160,12 +4997,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentMode(arg2);
@@ -4198,7 +5040,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4210,12 +5052,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetId(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetId(arg2);
@@ -4248,7 +5095,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_PyObj_FromLong((long)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4353,8 +5200,10 @@ static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kw
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Show",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Show(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Show(arg2);
@@ -4387,7 +5236,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4403,21 +5252,33 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj4) {
-        arg5 = PyInt_AsLong(obj4) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (bool) SWIG_PyObj_AsBool(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Move(*arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Move(*arg2,arg3,arg4,arg5);
@@ -4613,17 +5474,29 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (obj3) {
-        arg4 = PyInt_AsLong(obj3) ? true : false;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj3) {
+        {
+            arg4 = (bool) SWIG_PyObj_AsBool(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3,arg4);
@@ -4644,12 +5517,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentSize(arg2,arg3);
@@ -4733,7 +5616,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4752,14 +5635,42 @@ 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(!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 ((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_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -4795,7 +5706,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -4926,11 +5837,12 @@ 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(!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 ((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) {
@@ -4941,6 +5853,12 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje
          if (arg3 == NULL) SWIG_fail;
          temp3 = True;
      }
          if (arg3 == NULL) SWIG_fail;
          temp3 = True;
      }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_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);
@@ -4969,12 +5887,24 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        {
+            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFormatMode(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFormatMode(arg2,arg3);
@@ -4995,12 +5925,19 @@ 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(!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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetFormatMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetFormatMode(arg2);
@@ -5008,7 +5945,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5022,11 +5959,12 @@ 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(!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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          wxFont* temp;
@@ -5050,6 +5988,12 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject
          else
          arg2 = NULL;
      }
          else
          arg2 = NULL;
      }
+    if (obj2) {
+        {
+            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFont(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetFont(arg2,arg3);
@@ -5070,12 +6014,19 @@ 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(!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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxFont *)(arg1)->GetFont(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxFont *)(arg1)->GetFont(arg2);
@@ -5098,17 +6049,24 @@ 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(!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;
      }
      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;
      }
+    if (obj2) {
+        {
+            arg3 = (int) SWIG_PyObj_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);
@@ -5137,12 +6095,19 @@ 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(!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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetTextColour(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetTextColour(arg2);
@@ -5181,7 +6146,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5196,17 +6161,24 @@ 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(!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;
      }
      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;
      }
+    if (obj2) {
+        {
+            arg3 = (int) SWIG_PyObj_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);
@@ -5235,12 +6207,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetRegionName(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetRegionName(arg2);
@@ -5287,7 +6264,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_PyObj_FromInt((int)result);
      {
          if (temp2)
          delete arg2;
      {
          if (temp2)
          delete arg2;
@@ -5305,7 +6282,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
  static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
  static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyShape *arg1 = (wxPyShape *) 0 ;
-    wxString const &arg2_defvalue = "" ;
+    wxString const &arg2_defvalue = wxPyEmptyString ;
      wxString *arg2 = (wxString *) &arg2_defvalue ;
      bool temp2 = False ;
      PyObject * obj0 = 0 ;
      wxString *arg2 = (wxString *) &arg2_defvalue ;
      bool temp2 = False ;
      PyObject * obj0 = 0 ;
@@ -5530,12 +6507,19 @@ 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(!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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearText(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearText(arg2);
@@ -5590,6 +6574,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 
@@ -5597,8 +6584,24 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj3) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj4) {
          if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj4) {
          if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
@@ -5609,7 +6612,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg3));
          resultobj = t_output_helper(resultobj,o);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg3));
          resultobj = t_output_helper(resultobj,o);
@@ -5642,7 +6645,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5655,12 +6658,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->AttachmentIsValid(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->AttachmentIsValid(arg2);
@@ -5668,7 +6676,32 @@ 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 = SWIG_PyObj_FromBool((bool)result);
+    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;
@@ -5688,6 +6721,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 
@@ -5695,8 +6731,24 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj3) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj4) {
          if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj4) {
          if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
@@ -5707,7 +6759,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg3));
          resultobj = t_output_helper(resultobj,o);
      {
          PyObject *o = PyFloat_FromDouble((double) (*arg3));
          resultobj = t_output_helper(resultobj,o);
@@ -5736,12 +6788,14 @@ 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(!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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          arg2 = &temp2;
@@ -5751,6 +6805,14 @@ 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;
      }
+    {
+        arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (int) SWIG_PyObj_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();
      if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5780,14 +6842,19 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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;
@@ -5803,7 +6870,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5818,20 +6885,29 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    if (obj2) {
+        {
+            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj3) {
      if (obj3) {
-        arg4 = PyInt_AsLong(obj3) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg4 = (bool) SWIG_PyObj_AsBool(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5855,20 +6931,29 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    if (obj2) {
+        {
+            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj3) {
      if (obj3) {
-        arg4 = PyInt_AsLong(obj3) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg4 = (bool) SWIG_PyObj_AsBool(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5895,17 +6980,27 @@ 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(!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) {
          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(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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_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);
@@ -5913,7 +7008,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -5953,12 +7048,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetBranchingAttachmentRoot(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (arg1)->GetBranchingAttachmentRoot(arg2);
@@ -5991,6 +7091,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 ;
@@ -5999,8 +7100,12 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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;
@@ -6024,7 +7129,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6042,14 +7147,24 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (int) SWIG_PyObj_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;
@@ -6065,7 +7180,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6078,12 +7193,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentLineCount(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->GetAttachmentLineCount(arg2);
@@ -6091,7 +7211,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6103,12 +7223,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchNeckLength(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchNeckLength(arg2);
@@ -6141,7 +7266,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6153,12 +7278,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchStemLength(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchStemLength(arg2);
@@ -6191,7 +7321,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6203,12 +7333,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchSpacing(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchSpacing(arg2);
@@ -6241,7 +7376,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6253,12 +7388,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchStyle(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBranchStyle(arg2);
@@ -6291,7 +7431,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_PyObj_FromLong((long)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6304,12 +7444,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->PhysicalToLogicalAttachment(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->PhysicalToLogicalAttachment(arg2);
@@ -6317,7 +7462,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6330,12 +7475,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->LogicalToPhysicalAttachment(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (int)(arg1)->LogicalToPhysicalAttachment(arg2);
@@ -6343,7 +7493,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6368,7 +7518,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6396,7 +7546,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -6419,12 +7569,16 @@ 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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      if (obj1) {
      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 (obj1) {
-        arg2 = PyInt_AsLong(obj1) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      if (obj2) {
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6509,12 +7663,27 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
@@ -6547,7 +7716,37 @@ 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_PyObj_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_PyObj_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;
@@ -6799,8 +7998,10 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6944,12 +8145,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -6972,12 +8197,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -7000,12 +8249,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -7026,12 +8299,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -7058,21 +8341,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -7080,7 +8385,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -7098,21 +8403,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -7137,14 +8464,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -7167,12 +8520,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -7195,12 +8572,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -7225,14 +8626,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -7255,12 +8682,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -7283,12 +8734,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -7313,16 +8788,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -7416,8 +8911,10 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7445,15 +8942,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -7478,13 +9001,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -7509,13 +9056,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -7536,12 +9107,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -7562,12 +9143,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -7645,16 +9236,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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      if (arg2 == NULL) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Draw(*arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Draw(*arg2,arg3,arg4);
@@ -7729,12 +9330,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Scale(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Scale(arg2,arg3);
@@ -7755,12 +9366,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ScaleTo(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ScaleTo(arg2,arg3);
@@ -7781,12 +9402,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Translate(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Translate(arg2,arg3);
@@ -7808,12 +9439,27 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
@@ -7860,7 +9506,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      {
          if (temp2)
          delete arg2;
      {
          if (temp2)
          delete arg2;
@@ -7950,8 +9596,10 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *ar
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetRotateable",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetRotateable(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetRotateable(arg2);
@@ -7984,7 +9632,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -7997,12 +9645,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2,arg3);
@@ -8158,12 +9816,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetOutlineOp(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetOutlineOp(arg2);
@@ -8196,7 +9859,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -8221,7 +9884,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -8305,16 +9968,21 @@ 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(!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;
      }
      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;
      }
+    {
+        arg3 = (double) SWIG_PyObj_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);
@@ -8383,16 +10051,26 @@ 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(!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;
      }
      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;
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_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);
@@ -8522,13 +10200,18 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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();
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8551,14 +10234,26 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawPolygon(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawPolygon(arg2,arg3,arg4);
@@ -8579,13 +10274,18 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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();
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8689,8 +10389,10 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO
          arg2 = NULL;
      }
      if (obj2) {
          arg2 = NULL;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8737,8 +10439,10 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P
          arg2 = NULL;
      }
      if (obj2) {
          arg2 = NULL;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8869,12 +10573,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBackgroundMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetBackgroundMode(arg2);
@@ -8901,11 +10610,25 @@ 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_PyObj_AsDouble(obj0);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj1) {
+        {
+            arg2 = (double) SWIG_PyObj_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);
@@ -8955,12 +10678,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCornerRadius(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCornerRadius(arg2);
@@ -8975,6 +10703,31 @@ 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_PyObj_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 ;
@@ -9078,8 +10831,10 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9223,12 +10978,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -9251,12 +11030,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -9279,12 +11082,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -9305,12 +11132,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -9337,21 +11174,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -9359,7 +11218,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -9377,21 +11236,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -9416,14 +11297,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -9446,12 +11353,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -9474,12 +11405,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -9504,14 +11459,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -9534,12 +11515,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -9562,12 +11567,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -9592,16 +11621,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -9695,8 +11744,10 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9724,15 +11775,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -9757,13 +11834,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -9788,13 +11889,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -9815,12 +11940,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -9841,12 +11976,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -9879,17 +12024,45 @@ 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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj1) {
          if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj0) {
          if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj1) {
          if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
+    if (obj2) {
+        {
+            arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj3) {
+        {
+            arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyControlPoint *)new wxPyControlPoint(arg1,arg2,arg3,arg4,arg5,arg6);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyControlPoint *)new wxPyControlPoint(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -9939,12 +12112,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCornerRadius(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetCornerRadius(arg2);
@@ -10062,8 +12240,10 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10207,12 +12387,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -10235,12 +12439,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -10263,12 +12491,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -10289,12 +12541,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -10321,21 +12583,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -10343,7 +12627,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -10361,21 +12645,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -10400,14 +12706,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -10430,12 +12762,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -10458,12 +12814,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -10488,14 +12868,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -10518,12 +12924,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -10546,12 +12976,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -10576,16 +13030,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -10679,8 +13153,10 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10708,15 +13184,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -10741,13 +13243,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -10772,13 +13298,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -10799,12 +13349,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -10825,12 +13385,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -11136,8 +13706,10 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11281,12 +13853,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -11309,12 +13905,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -11337,12 +13957,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -11363,12 +14007,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -11395,21 +14049,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -11417,7 +14093,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -11435,21 +14111,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -11474,14 +14172,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -11504,12 +14228,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -11532,12 +14280,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -11562,14 +14334,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -11592,12 +14390,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -11620,12 +14442,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -11650,16 +14496,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -11753,8 +14619,10 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11782,15 +14650,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -11815,13 +14709,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -11846,13 +14764,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -11873,12 +14815,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -11899,12 +14851,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -12076,12 +15038,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawAtAngle(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawAtAngle(arg2);
@@ -12105,16 +15072,26 @@ 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(!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;
      }
      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;
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_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);
@@ -12173,13 +15150,18 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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();
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12233,14 +15215,26 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawPolygon(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawPolygon(arg2,arg3,arg4);
@@ -12294,16 +15288,21 @@ 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(!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;
      }
      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;
      }
+    {
+        arg3 = (double) SWIG_PyObj_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);
@@ -12324,13 +15323,18 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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();
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12411,7 +15415,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -12464,7 +15468,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -12497,7 +15501,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      {
          if (temp2)
          delete arg2;
      {
          if (temp2)
          delete arg2;
@@ -12519,12 +15523,27 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Rotate(arg2,arg3,arg4);
@@ -12606,12 +15625,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDrawnBackgroundMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetDrawnBackgroundMode(arg2);
@@ -12657,8 +15681,10 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args
          arg2 = NULL;
      }
      if (obj2) {
          arg2 = NULL;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12755,8 +15781,10 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args,
          arg2 = NULL;
      }
      if (obj2) {
          arg2 = NULL;
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12809,12 +15837,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Scale(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Scale(arg2,arg3);
@@ -12841,8 +15879,10 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetSaveToFile",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSaveToFile(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSaveToFile(arg2);
@@ -12863,12 +15903,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Translate(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Translate(arg2,arg3);
@@ -12986,8 +16036,10 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13131,12 +16183,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -13159,12 +16235,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -13187,12 +16287,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -13213,12 +16337,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -13245,21 +16379,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -13267,7 +16423,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -13285,21 +16441,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -13324,14 +16502,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -13354,12 +16558,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -13382,12 +16610,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -13412,14 +16664,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -13442,12 +16720,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -13470,12 +16772,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -13500,16 +16826,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -13603,8 +16949,10 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13632,15 +16980,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -13665,13 +17039,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -13696,13 +17094,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -13723,12 +17145,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -13749,12 +17181,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -13782,13 +17224,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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    {
+        arg1 = (int) SWIG_PyObj_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;
      {
      if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      arg3 = obj2;
      {
@@ -13825,7 +17272,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -13838,12 +17285,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpacing(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpacing(arg2,arg3);
@@ -13865,12 +17322,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_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);
@@ -13878,7 +17345,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -14014,14 +17481,19 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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;
      {
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      arg4 = obj3;
      {
@@ -14048,14 +17520,19 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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;
      {
      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;
      {
@@ -14119,7 +17596,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -14299,7 +17776,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -14436,8 +17913,10 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14581,12 +18060,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -14609,12 +18112,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -14637,12 +18164,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -14663,12 +18214,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -14695,21 +18256,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -14717,7 +18300,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -14735,21 +18318,43 @@ 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 * 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_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -14774,14 +18379,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -14804,12 +18435,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -14832,12 +18487,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -14862,14 +18541,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -14892,12 +18597,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -14920,12 +18649,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -14950,16 +18703,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -15053,8 +18826,10 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15082,15 +18857,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -15115,13 +18916,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -15146,13 +18971,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -15173,12 +19022,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -15199,12 +19058,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -15231,11 +19100,25 @@ 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_PyObj_AsDouble(obj0);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj1) {
+        {
+            arg2 = (double) SWIG_PyObj_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);
@@ -15431,8 +19314,10 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15576,12 +19461,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -15604,12 +19513,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -15632,12 +19565,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -15658,12 +19615,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -15690,21 +19657,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -15712,7 +19701,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -15730,21 +19719,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -15769,14 +19780,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -15799,12 +19836,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -15827,12 +19888,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -15857,14 +19942,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -15887,12 +19998,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -15915,12 +20050,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -15945,16 +20104,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -16048,8 +20227,10 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16077,15 +20258,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -16110,13 +20317,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -16141,13 +20372,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -16168,12 +20423,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -16194,12 +20459,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -16281,15 +20556,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AdjustBottom(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AdjustBottom(arg2,arg3);
@@ -16310,15 +20592,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AdjustLeft(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AdjustLeft(arg2,arg3);
@@ -16339,15 +20628,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AdjustRight(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AdjustRight(arg2,arg3);
@@ -16368,15 +20664,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg3 = PyInt_AsLong(obj2) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AdjustTop(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AdjustTop(arg2,arg3);
@@ -16396,12 +20699,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Divide(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->Divide(arg2);
@@ -16421,12 +20729,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->EditEdge(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->EditEdge(arg2);
@@ -16486,7 +20799,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -16662,15 +20975,27 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg4 = PyInt_AsLong(obj3) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (bool) SWIG_PyObj_AsBool(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ResizeAdjoining(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ResizeAdjoining(arg2,arg3,arg4);
@@ -16691,12 +21016,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->PopupMenu(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->PopupMenu(arg2,arg3);
@@ -16743,12 +21078,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetHandleSide(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetHandleSide(arg2);
@@ -17115,8 +21455,10 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17260,12 +21602,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -17288,12 +21654,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -17316,12 +21706,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -17342,12 +21756,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -17374,21 +21798,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -17396,7 +21842,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -17414,21 +21860,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -17453,14 +21921,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -17483,12 +21977,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -17511,12 +22029,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -17541,14 +22083,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -17571,12 +22139,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -17599,12 +22191,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -17629,16 +22245,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -17732,8 +22368,10 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17761,15 +22399,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -17794,13 +22458,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -17825,13 +22513,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -17852,12 +22564,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -17878,12 +22600,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -17910,11 +22642,25 @@ 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_PyObj_AsDouble(obj0);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj1) {
+        {
+            arg2 = (double) SWIG_PyObj_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);
@@ -18038,8 +22784,10 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18183,12 +22931,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -18211,12 +22983,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -18239,12 +23035,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -18265,12 +23085,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -18297,21 +23127,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -18319,7 +23171,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -18337,21 +23189,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -18376,14 +23250,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -18406,12 +23306,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -18434,12 +23358,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -18464,14 +23412,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -18494,12 +23468,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -18522,12 +23520,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -18552,16 +23574,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -18655,8 +23697,10 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18684,15 +23728,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -18717,13 +23787,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -18748,13 +23842,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -18775,12 +23893,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -18801,12 +23929,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -18832,11 +23970,18 @@ 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_PyObj_AsDouble(obj0);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyCircleShape *)new wxPyCircleShape(arg1);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyCircleShape *)new wxPyCircleShape(arg1);
@@ -18960,8 +24105,10 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19105,12 +24252,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -19133,12 +24304,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -19161,12 +24356,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -19187,12 +24406,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -19219,21 +24448,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -19241,7 +24492,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19259,21 +24510,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -19298,14 +24571,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -19328,12 +24627,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -19356,12 +24679,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -19386,14 +24733,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -19416,12 +24789,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -19444,12 +24841,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -19474,16 +24895,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -19577,8 +25018,10 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19606,15 +25049,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -19639,13 +25108,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -19670,13 +25163,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -19697,12 +25214,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -19723,12 +25250,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -19762,13 +25299,42 @@ 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_PyObj_AsInt(obj0);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj2) {
+        {
+            arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj3) {
+        {
+            arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj4) {
          {
              arg5 = wxString_in_helper(obj4);
      if (obj4) {
          {
              arg5 = wxString_in_helper(obj4);
@@ -19779,6 +25345,12 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
      if (obj5) {
          if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj5) {
          if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (long) SWIG_PyObj_AsLong(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxArrowHead *)new wxArrowHead(arg1,arg2,arg3,arg4,(wxString const &)*arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxArrowHead *)new wxArrowHead(arg1,arg2,arg3,arg4,(wxString const &)*arg5,arg6,arg7);
@@ -19845,7 +25417,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19870,7 +25442,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19882,12 +25454,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPosition(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetPosition(arg2);
@@ -19920,7 +25497,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19945,7 +25522,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19970,7 +25547,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -19995,7 +25572,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20038,12 +25615,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetXOffset(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetXOffset(arg2);
@@ -20063,12 +25645,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetYOffset(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetYOffset(arg2);
@@ -20128,7 +25715,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_PyObj_FromLong((long)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20153,7 +25740,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20178,7 +25765,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20190,12 +25777,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSize(arg2);
@@ -20215,12 +25807,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpacing(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSpacing(arg2);
@@ -20307,14 +25904,41 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj2) {
+        {
+            arg3 = (int) SWIG_PyObj_AsInt(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj3) {
+        {
+            arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj5) {
          {
              arg6 = wxString_in_helper(obj5);
      if (obj5) {
          {
              arg6 = wxString_in_helper(obj5);
@@ -20325,6 +25949,12 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
      if (obj6) {
          if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj6) {
          if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
+    if (obj7) {
+        {
+            arg8 = (long) SWIG_PyObj_AsLong(obj7);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AddArrow(arg2,arg3,arg4,arg5,(wxString const &)*arg6,arg7,arg8);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AddArrow(arg2,arg3,arg4,arg5,(wxString const &)*arg6,arg7,arg8);
@@ -20356,14 +25986,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(!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;
      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;
+    {
+        arg4 = (int) SWIG_PyObj_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);
@@ -20404,7 +26039,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      {
          if (temp2)
          delete arg2;
      {
          if (temp2)
          delete arg2;
@@ -20424,12 +26059,19 @@ 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(!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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearArrowsAtPosition(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ClearArrowsAtPosition(arg2);
@@ -20454,20 +26096,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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxArrowHead,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) {
          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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (bool) SWIG_PyObj_AsBool(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawArrow(*arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DrawArrow(*arg2,arg3,arg4,arg5);
@@ -20488,12 +26137,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->DeleteArrowHead(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->DeleteArrowHead(arg2);
@@ -20501,7 +26155,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20516,13 +26170,18 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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;
@@ -20535,7 +26194,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      {
          if (temp3)
          delete arg3;
      {
          if (temp3)
          delete arg3;
@@ -20568,7 +26227,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20615,17 +26274,27 @@ 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(!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) {
          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(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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_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);
@@ -20650,17 +26319,27 @@ 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(!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) {
          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(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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_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);
@@ -20681,12 +26360,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxArrowHead *)(arg1)->FindArrowHead(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxArrowHead *)(arg1)->FindArrowHead(arg2);
@@ -20711,13 +26395,18 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_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;
@@ -20806,12 +26495,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_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);
@@ -20819,7 +26518,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20844,7 +26543,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20872,8 +26571,10 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj
      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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg5 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->FindNth(arg2,arg3,arg4,arg5);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->FindNth(arg2,arg3,arg4,arg5);
@@ -20914,7 +26615,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -20939,7 +26640,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21034,14 +26735,19 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetLabelPosition(arg2,arg3,arg4);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->GetLabelPosition(arg2,arg3,arg4);
@@ -21191,7 +26897,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21216,7 +26922,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21228,12 +26934,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeLineControlPoints(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->MakeLineControlPoints(arg2);
@@ -21278,12 +26989,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentFrom(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentFrom(arg2);
@@ -21304,12 +27020,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (int) SWIG_PyObj_AsInt(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachments(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachments(arg2,arg3);
@@ -21329,12 +27055,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentTo(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetAttachmentTo(arg2);
@@ -21357,12 +27088,32 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObj
      double arg4 ;
      double arg5 ;
      PyObject * obj0 = 0 ;
      double arg4 ;
      double arg5 ;
      PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
      char *kwnames[] = {
          (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
      };
      
      char *kwnames[] = {
          (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odddd:PyLineShape_SetEnds",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto 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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_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);
@@ -21416,8 +27167,10 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *ar
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetIgnoreOffsets",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetIgnoreOffsets(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetIgnoreOffsets(arg2);
@@ -21444,96 +27197,282 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyO
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetSpline",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetSpline(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    wxPyShape *arg2 = (wxPyShape *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "object", NULL 
+    };
+    
+    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;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetTo(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    wxDC *arg2 = (wxDC *) NULL ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "dc", NULL 
+    };
+    
+    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 (obj1) {
+        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->Straighten(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    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;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->Unlink();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+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_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (bool) SWIG_PyObj_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_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (int) SWIG_PyObj_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_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->SetSpline(arg2);
+        result = (bool)(arg1)->GetAlignmentOrientation(arg2);
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
  }
  
  
      return resultobj;
      fail:
      return NULL;
  }
  
  
-static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      PyObject *resultobj;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
-    wxPyShape *arg2 = (wxPyShape *) 0 ;
+    bool arg2 ;
+    int result;
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      char *kwnames[] = {
      PyObject * obj0 = 0 ;
      PyObject * obj1 = 0 ;
      char *kwnames[] = {
-        (char *) "self",(char *) "object", NULL 
+        (char *) "self",(char *) "isEnd", NULL 
      };
      
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetTo",kwnames,&obj0,&obj1)) goto fail;
+    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;
      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;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->SetTo(arg2);
+        result = (int)(arg1)->GetAlignmentType(arg2);
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = SWIG_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
  }
  
  
      return resultobj;
      fail:
      return NULL;
  }
  
  
-static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      PyObject *resultobj;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
-    wxDC *arg2 = (wxDC *) NULL ;
+    int result;
      PyObject * obj0 = 0 ;
      PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
      char *kwnames[] = {
      char *kwnames[] = {
-        (char *) "self",(char *) "dc", NULL 
+        (char *) "self", NULL 
      };
      
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_Straighten",kwnames,&obj0,&obj1)) goto fail;
+    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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->Straighten(arg2);
+        result = (int)((wxPyLineShape const *)arg1)->GetAlignmentStart();
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = SWIG_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
  }
  
  
      return resultobj;
      fail:
      return NULL;
  }
  
  
-static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
      PyObject *resultobj;
      wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
+    int result;
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
          (char *) "self", NULL 
      };
      
      PyObject * obj0 = 0 ;
      char *kwnames[] = {
          (char *) "self", NULL 
      };
      
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Unlink",kwnames,&obj0)) goto fail;
+    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();
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->Unlink();
+        result = (int)((wxPyLineShape const *)arg1)->GetAlignmentEnd();
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
          
          wxPyEndAllowThreads(__tstate);
          if (PyErr_Occurred()) SWIG_fail;
      }
-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = SWIG_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21619,8 +27558,10 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21764,12 +27705,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -21792,12 +27757,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -21820,12 +27809,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -21846,12 +27859,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -21878,21 +27901,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -21900,7 +27945,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -21918,21 +27963,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -21957,14 +28024,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -21987,12 +28080,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -22015,12 +28132,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -22045,14 +28186,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -22075,12 +28242,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -22103,12 +28294,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -22133,16 +28348,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -22236,8 +28471,10 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22265,15 +28502,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -22298,13 +28561,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -22329,13 +28616,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -22356,12 +28667,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -22382,12 +28703,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -22494,12 +28825,19 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
      int arg2 = (int) 0 ;
      PyObject * obj0 = 0 ;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
      int arg2 = (int) 0 ;
      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 *)"O|i:PyPolygonShape_AddPolygonPoint",kwnames,&obj0,&arg2)) goto fail;
+    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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AddPolygonPoint(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->AddPolygonPoint(arg2);
@@ -22543,12 +28881,19 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObjec
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
      int arg2 = (int) 0 ;
      PyObject * obj0 = 0 ;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
      int arg2 = (int) 0 ;
      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 *)"O|i:PyPolygonShape_DeletePolygonPoint",kwnames,&obj0,&arg2)) goto fail;
+    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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DeletePolygonPoint(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->DeletePolygonPoint(arg2);
@@ -22588,6 +28933,141 @@ static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args,
  }
  
  
  }
  
  
+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();
+        result = (PyObject *)wxPyPolygonShape_GetOriginalPoints(arg1);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = result;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    double result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    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();
+        result = (double)((wxPyPolygonShape const *)arg1)->GetOriginalWidth();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_PyObj_FromDouble((double)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    double result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    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();
+        result = (double)((wxPyPolygonShape const *)arg1)->GetOriginalHeight();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_PyObj_FromDouble((double)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    double arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "w", NULL 
+    };
+    
+    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_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetOriginalWidth(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
+    double arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "h", NULL 
+    };
+    
+    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_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetOriginalHeight(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
  static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
  static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
      PyObject *resultobj;
      wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
@@ -22691,8 +29171,10 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22836,12 +29318,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -22864,12 +29370,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -22892,12 +29422,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -22918,12 +29472,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -22950,21 +29514,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -22972,7 +29558,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -22990,21 +29576,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -23029,14 +29637,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -23059,12 +29693,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -23087,12 +29745,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -23117,14 +29799,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -23147,12 +29855,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -23175,12 +29907,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -23205,16 +29961,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -23308,8 +30084,10 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23337,15 +30115,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -23370,13 +30174,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -23401,13 +30229,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -23428,12 +30280,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -23454,12 +30316,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -23486,11 +30358,25 @@ 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_PyObj_AsDouble(obj0);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj1) {
+        {
+            arg2 = (double) SWIG_PyObj_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);
@@ -23638,8 +30524,10 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23783,12 +30671,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -23811,12 +30723,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -23839,12 +30775,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -23865,12 +30825,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnSize(arg2,arg3);
@@ -23897,21 +30867,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -23919,7 +30911,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -23937,21 +30929,43 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
-    if (obj6) {
-        arg7 = PyInt_AsLong(obj6) ? true : false;
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_AsDouble(obj5);  
          if (PyErr_Occurred()) SWIG_fail;
      }
          if (PyErr_Occurred()) SWIG_fail;
      }
+    if (obj6) {
+        {
+            arg7 = (bool) SWIG_PyObj_AsBool(obj6);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7);
@@ -23976,14 +30990,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -24006,12 +31046,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -24034,12 +31098,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -24064,14 +31152,40 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -24094,12 +31208,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -24122,12 +31260,36 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_AsInt(obj3);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -24152,16 +31314,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -24255,8 +31437,10 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
      if (obj2) {
-        arg3 = PyInt_AsLong(obj2) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
+        {
+            arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
      }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24284,15 +31468,41 @@ 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(!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;
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg3 = (bool) SWIG_PyObj_AsBool(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_AsInt(obj5);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj6) {
+        {
+            arg7 = (int) SWIG_PyObj_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);
@@ -24317,13 +31527,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -24348,13 +31582,37 @@ 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(!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;
      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_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_AsInt(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
+    if (obj5) {
+        {
+            arg6 = (int) SWIG_PyObj_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);
@@ -24375,12 +31633,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnBeginSize(arg2,arg3);
@@ -24401,12 +31669,22 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->base_OnEndSize(arg2,arg3);
@@ -24548,16 +31826,36 @@ 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(!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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); 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) {
          PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
      }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (double) SWIG_PyObj_AsDouble(obj4);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg6 = (double) SWIG_PyObj_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);
@@ -24578,12 +31876,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (long) SWIG_PyObj_AsLong(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->FindShape(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          result = (wxPyShape *)(arg1)->FindShape(arg2);
@@ -24645,7 +31948,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24670,7 +31973,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_PyObj_FromDouble((double)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24695,7 +31998,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_PyObj_FromInt((int)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24745,7 +32048,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24770,7 +32073,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -24947,12 +32250,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetGridSpacing(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetGridSpacing(arg2);
@@ -24972,12 +32280,17 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMouseTolerance(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetMouseTolerance(arg2);
@@ -25004,8 +32317,10 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args,
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetQuickEditMode",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetQuickEditMode(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetQuickEditMode(arg2);
@@ -25032,8 +32347,10 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyO
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetSnapToGrid",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSnapToGrid(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->SetSnapToGrid(arg2);
@@ -25060,8 +32377,10 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject
      
      if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_ShowAll",kwnames,&obj0,&obj1)) goto fail;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      
      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 (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ShowAll(arg2);
      {
          PyThreadState* __tstate = wxPyBeginAllowThreads();
          (arg1)->ShowAll(arg2);
@@ -25147,17 +32466,25 @@ 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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj0) {
          if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
+    if (obj1) {
+        {
+            arg2 = (int) SWIG_PyObj_AsInt(obj1);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj2) {
          {
              arg3 = &temp3;
      if (obj2) {
          {
              arg3 = &temp3;
@@ -25170,6 +32497,12 @@ 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_PyObj_AsLong(obj4);  
+            if (PyErr_Occurred()) SWIG_fail;
+        }
+    }
      if (obj5) {
          {
              arg6 = wxString_in_helper(obj5);
      if (obj5) {
          {
              arg6 = wxString_in_helper(obj5);
@@ -25274,6 +32607,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[] = {
@@ -25281,8 +32616,16 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
      if (obj3) {
          if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxClassInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
      if (obj3) {
          if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxClassInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
      }
@@ -25319,13 +32662,28 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg5 = (int) SWIG_PyObj_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);
@@ -25391,7 +32749,7 @@ 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 = SWIG_PyObj_FromBool((bool)result);
      return resultobj;
      fail:
      return NULL;
      return resultobj;
      fail:
      return NULL;
@@ -25432,12 +32790,29 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_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);
@@ -25459,12 +32834,29 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_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);
@@ -25486,12 +32878,29 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_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);
@@ -25513,12 +32922,29 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_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);
@@ -25542,14 +32968,33 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -25573,14 +33018,33 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
+    {
+        arg2 = (bool) SWIG_PyObj_AsBool(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg4 = (double) SWIG_PyObj_AsDouble(obj3);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        {
+            arg5 = (int) SWIG_PyObj_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);
@@ -25602,12 +33066,29 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_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);
@@ -25629,12 +33110,29 @@ 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(!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;
      if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = (double) SWIG_PyObj_AsDouble(obj1);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        arg3 = (double) SWIG_PyObj_AsDouble(obj2);  
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj3) {
+        {
+            arg4 = (int) SWIG_PyObj_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);
@@ -25861,6 +33359,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 },
@@ -26002,6 +33508,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 },
@@ -26030,6 +33537,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 },
@@ -26110,6 +33618,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 },
@@ -26534,6 +34043,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 },
@@ -26570,6 +34085,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 },
@@ -27155,9 +34675,6 @@ static void *_p_wxNavigationKeyEventTo_p_wxObject(void *x) {
  static void *_p_wxKeyEventTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvent *) ((wxKeyEvent *) x));
  }
  static void *_p_wxKeyEventTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvent *) ((wxKeyEvent *) x));
  }
-static void *_p_wxScrolledWindowTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *) ((wxScrolledWindow *) x));
-}
  static void *_p_wxWindowTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvtHandler *) ((wxWindow *) x));
  }
  static void *_p_wxWindowTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvtHandler *) ((wxWindow *) x));
  }
@@ -27167,6 +34684,9 @@ static void *_p_wxMenuTo_p_wxObject(void *x) {
  static void *_p_wxMenuBarTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
  }
  static void *_p_wxMenuBarTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
  }
+static void *_p_wxScrolledWindowTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *) ((wxScrolledWindow *) x));
+}
  static void *_p_wxTopLevelWindowTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxTopLevelWindow *) x));
  }
  static void *_p_wxTopLevelWindowTo_p_wxObject(void *x) {
      return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxTopLevelWindow *) x));
  }
@@ -27227,6 +34747,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));
  }
@@ -27565,6 +35088,7 @@ static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"
  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_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_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{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_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}};
@@ -27573,11 +35097,11 @@ static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p
  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_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_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0},{"_p_wxPyDrawnShape"},{0}};
+static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0},{"_p_wxPyDivisionShape"},{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_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_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_wxAttachmentPoint", _p_wxAttachmentPointTo_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_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}};
@@ -27587,6 +35111,7 @@ static swig_type_info _swigt__p_wxPyShapeCanvas[] = {{"_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_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_wxAttachmentPoint[] = {{"_p_wxAttachmentPoint", 0, "wxAttachmentPoint *", 0},{"_p_wxAttachmentPoint"},{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_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}};
@@ -27607,6 +35132,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, 
@@ -27615,8 +35141,8 @@ _swigt__p_wxFont,
  _swigt__p_wxScrolledWindow, 
  _swigt__p_wxWindow, 
  _swigt__p_double, 
  _swigt__p_wxScrolledWindow, 
  _swigt__p_wxWindow, 
  _swigt__p_double, 
-_swigt__p_wxPyDivisionShape, 
  _swigt__p_wxPyDrawnShape, 
  _swigt__p_wxPyDrawnShape, 
+_swigt__p_wxPyDivisionShape, 
  _swigt__p_wxPyPolygonShape, 
  _swigt__p_wxBitmap, 
  _swigt__p_wxObject, 
  _swigt__p_wxPyPolygonShape, 
  _swigt__p_wxBitmap, 
  _swigt__p_wxObject, 
@@ -27629,6 +35155,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, 
@@ -27646,70 +35173,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
@@ -27736,6 +35199,70 @@ SWIGEXPORT(void) SWIG_init(void) {
      }
      SWIG_InstallConstants(d,swig_const_table);
      
      }
      SWIG_InstallConstants(d,swig_const_table);
      
+    PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_PyObj_FromInt((int)oglMETAFLAGS_OUTLINE));
+    PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_PyObj_FromInt((int)oglMETAFLAGS_ATTACHMENTS));
+    PyDict_SetItemString(d,"KEY_SHIFT", SWIG_PyObj_FromInt((int)KEY_SHIFT));
+    PyDict_SetItemString(d,"KEY_CTRL", SWIG_PyObj_FromInt((int)KEY_CTRL));
+    PyDict_SetItemString(d,"ARROW_NONE", SWIG_PyObj_FromInt((int)ARROW_NONE));
+    PyDict_SetItemString(d,"ARROW_END", SWIG_PyObj_FromInt((int)ARROW_END));
+    PyDict_SetItemString(d,"ARROW_BOTH", SWIG_PyObj_FromInt((int)ARROW_BOTH));
+    PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_PyObj_FromInt((int)ARROW_MIDDLE));
+    PyDict_SetItemString(d,"ARROW_START", SWIG_PyObj_FromInt((int)ARROW_START));
+    PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_HOLLOW_CIRCLE));
+    PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_FILLED_CIRCLE));
+    PyDict_SetItemString(d,"ARROW_ARROW", SWIG_PyObj_FromInt((int)ARROW_ARROW));
+    PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_SINGLE_OBLIQUE));
+    PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_DOUBLE_OBLIQUE));
+    PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_PyObj_FromInt((int)ARROW_METAFILE));
+    PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_PyObj_FromInt((int)ARROW_POSITION_END));
+    PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_PyObj_FromInt((int)ARROW_POSITION_START));
+    PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_VERTICAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_HORIZONTAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_DIAGONAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_TO));
+    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_FROM));
+    PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_PyObj_FromInt((int)CONTROL_POINT_LINE));
+    PyDict_SetItemString(d,"FORMAT_NONE", SWIG_PyObj_FromInt((int)FORMAT_NONE));
+    PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_HORIZ));
+    PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_VERT));
+    PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_PyObj_FromInt((int)FORMAT_SIZE_TO_CONTENTS));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_HORIZ));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_VERT));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_NONE));
+    PyDict_SetItemString(d,"SHADOW_NONE", SWIG_PyObj_FromInt((int)SHADOW_NONE));
+    PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_PyObj_FromInt((int)SHADOW_LEFT));
+    PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_PyObj_FromInt((int)SHADOW_RIGHT));
+    PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_PyObj_FromInt((int)OP_CLICK_LEFT));
+    PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_PyObj_FromInt((int)OP_CLICK_RIGHT));
+    PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_PyObj_FromInt((int)OP_DRAG_LEFT));
+    PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_PyObj_FromInt((int)OP_DRAG_RIGHT));
+    PyDict_SetItemString(d,"OP_ALL", SWIG_PyObj_FromInt((int)OP_ALL));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_NONE));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_EDGE));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_BRANCHING));
+    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_NORMAL));
+    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_BLOB));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_BOTH));
+    PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_LEFT_OF));
+    PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_RIGHT_OF));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ABOVE));
+    PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_PyObj_FromInt((int)gyCONSTRAINT_BELOW));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_TOP));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_PyObj_FromInt((int)DIVISION_SIDE_NONE));
+    PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_LEFT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_PyObj_FromInt((int)DIVISION_SIDE_TOP));
+    PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_RIGHT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_PyObj_FromInt((int)DIVISION_SIDE_BOTTOM));
      
      
      //     initoglbasicc();
      
      
      //     initoglbasicc();