X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce7284bd976f469991149a4ff0cd52294b9b61ad..9342fdbe5e17b09025d53496dd983bc7eb99f21f:/wxPython/contrib/ogl/mac/ogl_wrap.cpp diff --git a/wxPython/contrib/ogl/mac/ogl_wrap.cpp b/wxPython/contrib/ogl/mac/ogl_wrap.cpp index 54a4c30428..a10a04ffd1 100644 --- a/wxPython/contrib/ogl/mac/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/mac/ogl_wrap.cpp @@ -43,6 +43,7 @@ private: #define SWIG_TypeCast SWIG_Python_TypeCast #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast #define SWIG_TypeName SWIG_Python_TypeName +#define SWIG_TypePrettyName SWIG_Python_TypePrettyName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData #define SWIG_PackData SWIG_Python_PackData @@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *); SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *); SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); +SWIGIMPORT(const char *) SWIG_TypePrettyName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); @@ -123,6 +125,7 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); } #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -133,8 +136,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); * ************************************************************************/ -#include "Python.h" - #ifdef __cplusplus extern "C" { #endif @@ -204,6 +205,7 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #endif + /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_wxOGLConstraint swig_types[0] @@ -259,47 +261,64 @@ static swig_type_info *swig_types[42]; #define SWIG_name "_ogl" -/* Auxiliar swig macros */ +/* Auxiliar swig macros that appear in the header */ + +#define SWIG_OLDOBJ 1 +#define SWIG_NEWOBJ SWIG_OLDOBJ + 1 +#define SWIG_PYSTR SWIG_NEWOBJ + 1 #ifdef __cplusplus #define SWIGSTATICINLINE(a) static inline a #define SWIGSTATIC(a) static a -#define swig_new_array(type, size) (new type[(size)]) +#define swig_new_array(size,Type) (new Type[(size)]) +#define swig_delete(cptr) delete cptr #define swig_delete_array(cptr) delete[] cptr -#define swig_const_cast(type,a) const_cast(a) -#define swig_static_cast(type,a) static_cast(a) -#define swig_reinterpret_cast(type,a) reinterpret_cast(a) - -#ifdef HAVE_NUMERIC_CAST -#define swig_numeric_cast(type,a) numeric_cast(a) -#else -#define swig_numeric_cast(type,a) static_cast(a) -#endif +#define swig_const_cast(a,Type) const_cast(a) +#define swig_static_cast(a,Type) static_cast(a) +#define swig_reinterpret_cast(a,Type) reinterpret_cast(a) +#define swig_new_copy(ptr,Type) (new Type(*ptr)) +#define swig_numeric_cast(a,Type) static_cast(a) #else /* C case */ #define SWIGSTATICINLINE(a) static a #define SWIGSTATIC(a) static a -#define swig_new_array(type, size) ((type*) malloc((size)*sizeof(type))) +#define swig_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type))) +#define swig_delete(cptr) free((char*)cptr) #define swig_delete_array(cptr) free((char*)cptr) -#define swig_const_cast(type,a) (type)(a) -#define swig_static_cast(type,a) (type)(a) -#define swig_reinterpret_cast(type,a) (type)(a) -#define swig_numeric_cast(type,a) (type)(a) +#define swig_const_cast(a,Type) (Type)(a) +#define swig_static_cast(a,Type) (Type)(a) +#define swig_reinterpret_cast(a,Type) (Type)(a) +#define swig_numeric_cast(a,Type) (Type)(a) +#define swig_new_copy(ptr,Type) ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type))) #endif /* __cplusplus */ -#define SWIG_FromSignedChar PyInt_FromLong -#define SWIG_FromUnsignedChar PyInt_FromLong -#define SWIG_FromShort PyInt_FromLong -#define SWIG_FromUnsignedShort PyInt_FromLong -#define SWIG_FromInt PyInt_FromLong -#define SWIG_FromLong PyInt_FromLong -#define SWIG_FromFloat PyFloat_FromDouble -#define SWIG_FromDouble PyFloat_FromDouble -#define SWIG_FromFloat PyFloat_FromDouble -#define SWIG_FromDouble PyFloat_FromDouble +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_signed_SS_char PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_char PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_short PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_short PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_int PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_long PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_float PyFloat_FromDouble +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_double PyFloat_FromDouble +/*@@*/ #include "wx/wxPython/wxPython.h" @@ -309,111 +328,159 @@ static swig_type_info *swig_types[42]; static const wxString wxPyEmptyString(wxEmptyString); +// See my_fragments.i +SWIGSTATICINLINE(int) +SWIG_AsVal_double(PyObject *obj, double* val) +{ + if (PyNumber_Check(obj)) { + if (val) *val = PyFloat_AsDouble(obj); + return 1; + } + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + } + return 0; +} + + SWIGSTATICINLINE(double) -SWIG_AsDouble(PyObject *obj) +SWIG_As_double(PyObject* obj) { - double val = (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : -#if HAVE_LONG_LONG - ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); -#else - ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); -#endif - if (PyErr_Occurred()) { - PyErr_Clear(); - PyErr_SetString(PyExc_TypeError, "a double is expected"); + double v; + if (!SWIG_AsVal_double(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(double)); } - return val; + return v; } - + SWIGSTATICINLINE(int) -SWIG_CheckDouble(PyObject* obj) +SWIG_Check_double(PyObject* obj) { - SWIG_AsDouble(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; - } + return SWIG_AsVal_double(obj, (double*)0); } #include -SWIGSTATICINLINE(long) -SWIG_CheckLongInRange(long value, const char* type, - long min_value, long max_value) +SWIGSTATICINLINE(int) + SWIG_CheckLongInRange(long value, long min_value, long max_value, + const char *errmsg) { - if (!PyErr_Occurred()) { - if (value < min_value) { - PyObject *err = - PyString_FromFormat("value %ld is less than '%s' minimum %ld", - value, type, min_value); - - PyErr_SetObject(PyExc_OverflowError, err); - Py_DECREF(err); - } else if (value > max_value) { - PyObject *err = - PyString_FromFormat("value %ld is greater than '%s' maximum %ld", - value, type, max_value); - PyErr_SetObject(PyExc_OverflowError, err); - Py_DECREF(err); + if (value < min_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %ld is less than '%s' minimum %ld", + value, errmsg, min_value); + } + return 0; + } else if (value > max_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %ld is greater than '%s' maximum %ld", + value, errmsg, max_value); } + return 0; } - return value; + return 1; } -SWIGSTATICINLINE(long) -SWIG_AsLong(PyObject * obj) +// See my_fragments.i +SWIGSTATICINLINE(int) +SWIG_AsVal_long(PyObject* obj, long* val) { - return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); + if (PyNumber_Check(obj)) { + if (val) *val = PyInt_AsLong(obj); + return 1; + } + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + } + return 0; } #if INT_MAX != LONG_MAX SWIGSTATICINLINE(int) -SWIG_AsInt(PyObject *obj) + SWIG_AsVal_int(PyObject *obj, int *val) { - return swig_numeric_cast(int, - SWIG_CheckLongInRange(SWIG_AsLong(obj), - "int", INT_MIN, INT_MAX)); + const char* errmsg = val ? "int" : 0; + long v; + if (SWIG_AsVal_long(obj, &v)) { + if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) { + if (val) *val = swig_numeric_cast(v, int); + return 1; + } else { + return 0; + } + } else { + PyErr_Clear(); + } + if (val) { + PyErr_SetString(PyExc_TypeError, "an int is expected"); + } + return 0; } #else -#define SWIG_AsInt SWIG_AsLong +SWIGSTATICINLINE(int) + SWIG_AsVal_int(PyObject *obj, int *val) +{ + return SWIG_AsVal_long(obj,(long*)val); +} #endif SWIGSTATICINLINE(int) -SWIG_CheckInt(PyObject* obj) +SWIG_As_int(PyObject* obj) { - SWIG_AsInt(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; + int v; + if (!SWIG_AsVal_int(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(int)); } + return v; +} + + +SWIGSTATICINLINE(int) +SWIG_Check_int(PyObject* obj) +{ + return SWIG_AsVal_int(obj, (int*)0); } -static PyObject* t_output_helper(PyObject* target, PyObject* o) { + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - + if (!target) { target = o; } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); - } + } o3 = PyTuple_New(1); PyTuple_SetItem(o3, 0, o); @@ -423,7 +490,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { Py_DECREF(o3); } return target; -} + } + WXSHAPE_IMP_CALLBACKS(wxPyShapeEvtHandler,wxShapeEvtHandler); @@ -432,23 +500,50 @@ void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } -SWIGSTATICINLINE(bool) -SWIG_AsBool(PyObject *obj) +SWIGSTATICINLINE(int) + SWIG_AsVal_bool(PyObject *obj, bool *val) { - return PyObject_IsTrue(obj) ? true : false; + /* if (val) *val = PyObject_IsTrue(obj); return 1; */ + if (obj == Py_True) { + if (val) *val = true; + return 1; + } + if (obj == Py_False) { + if (val) *val = false; + return 1; + } + int res = 0; + if (SWIG_AsVal_int(obj, &res)) { + if (val) *val = (bool)res; + return 1; + } + if (val) { + PyErr_SetString(PyExc_TypeError, "a bool is expected"); + } + return 0; } -SWIGSTATICINLINE(int) -SWIG_CheckBool(PyObject* obj) +SWIGSTATICINLINE(bool) +SWIG_As_bool(PyObject* obj) { - SWIG_AsBool(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; + bool v; + if (!SWIG_AsVal_bool(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(bool)); } + return v; +} + + +SWIGSTATICINLINE(int) +SWIG_Check_bool(PyObject* obj) +{ + return SWIG_AsVal_bool(obj, (bool*)0); } @@ -458,21 +553,42 @@ PyObject *wxPyShape_GetChildren(wxPyShape *self){ wxList& list = self->GetChildren(); return wxPy_ConvertShapeList(&list); } + +SWIGSTATICINLINE(PyObject*) + SWIG_From_bool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + + PyObject *wxPyShape_GetLines(wxPyShape *self){ wxList& list = self->GetLines(); return wxPy_ConvertShapeList(&list); } -SWIGSTATICINLINE(int) -SWIG_CheckLong(PyObject* obj) +SWIGSTATICINLINE(long) +SWIG_As_long(PyObject* obj) { - SWIG_AsLong(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; + long v; + if (!SWIG_AsVal_long(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(long)); } + return v; +} + + +SWIGSTATICINLINE(int) +SWIG_Check_long(PyObject* obj) +{ + return SWIG_AsVal_long(obj, (long*)0); } PyObject *wxPyShape_GetRegions(wxPyShape *self){ @@ -578,7 +694,25 @@ void wxPyLineShape_AddArrowOrdered(wxPyLineShape *self,wxArrowHead *arrow,PyObje } PyObject *wxPyLineShape_GetLineControlPoints(wxPyLineShape *self){ wxList* list = self->GetLineControlPoints(); - return wxPy_ConvertShapeList(list); + return wxPy_ConvertRealPointList(list); + } +void wxPyLineShape_SetLineControlPoints(wxPyLineShape *self,PyObject *list){ + wxList* real_point_list = wxPy_wxRealPoint_ListHelper(list); + self->MakeLineControlPoints((int)(real_point_list->GetCount())); + wxList* old_control_points = self->GetLineControlPoints(); + wxNode* old_node = old_control_points->GetFirst(); + wxNode* real_node = real_point_list->GetFirst(); + while(old_node) + { + wxRealPoint* old_point = (wxRealPoint*)old_node->GetData(); + wxRealPoint* new_point = (wxRealPoint*)real_node->GetData(); + old_point->x = new_point->x; + old_point->y = new_point->y; + old_node = old_node->GetNext(); + real_node = real_node->GetNext(); + } + self->ClearPointList(*real_point_list); + delete real_point_list; } WXSHAPE_IMP_CALLBACKS(wxPyPolygonShape, wxPolygonShape); @@ -594,21 +728,7 @@ PyObject *wxPyPolygonShape_Create(wxPyPolygonShape *self,PyObject *points){ } PyObject *wxPyPolygonShape_GetPoints(wxPyPolygonShape *self){ wxList* list = self->GetPoints(); - PyObject* pyList; - PyObject* pyObj; - 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; + return wxPy_ConvertRealPointList(list); } PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){ wxList* list = self->GetOriginalPoints(); @@ -617,7 +737,7 @@ PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){ wxObject* wxObj; wxNode* node = list->GetFirst(); - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { wxObj = node->GetData(); @@ -625,7 +745,7 @@ PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){ PyList_Append(pyList, pyObj); node = node->GetNext(); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return pyList; } @@ -656,17 +776,17 @@ PyObject *wxDiagram_GetShapeList(wxDiagram *self){ // work for any class for the VERY generic cases, but beyond that the helper // needs to know more about the type. wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (!PyList_Check(pyList)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } int count = PyList_Size(pyList); wxList* list = new wxList; if (! list) { PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } for (int x=0; xAppend(wxo); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return list; } //--------------------------------------------------------------------------- wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (!PyList_Check(pyList)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } int count = PyList_Size(pyList); wxList* list = new wxList; if (! list) { PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object"); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } for (int x=0; xAppend((wxObject*) new wxRealPoint(*wxo)); } } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return list; } //--------------------------------------------------------------------------- -PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { +PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source, bool setThisOwn) { PyObject* target = NULL; if (source && wxIsKindOf(source, wxShapeEvtHandler)) { @@ -745,7 +865,7 @@ PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { } } if (! target) { - target = wxPyMake_wxObject2(source, FALSE); + target = wxPyMake_wxObject2(source, setThisOwn, false); if (target != Py_None) ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target)); } @@ -754,6 +874,27 @@ PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { //--------------------------------------------------------------------------- +PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) { + wxList* list = (wxList*)listbase; + PyObject* pyList; + PyObject* pyObj; + wxObject* wxObj; + wxNode* node = list->GetFirst(); + + bool blocked = wxPyBeginBlockThreads(); + pyList = PyList_New(0); + while (node) { + wxObj = node->GetData(); + pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0); + PyList_Append(pyList, pyObj); + node = node->GetNext(); + } + wxPyEndBlockThreads(blocked); + return pyList; +} + +//--------------------------------------------------------------------------- + PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { wxList* list = (wxList*)listbase; PyObject* pyList; @@ -761,15 +902,15 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { wxObject* wxObj; wxNode* node = list->GetFirst(); - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { wxObj = node->GetData(); - pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj); + pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj, false); PyList_Append(pyList, pyObj); node = node->GetNext(); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return pyList; } @@ -929,9 +1070,9 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -962,9 +1103,9 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -995,9 +1136,9 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1028,9 +1169,9 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetProportions",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1059,7 +1200,7 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFormatMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1221,14 +1362,16 @@ static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *, PyObject *args, PyObje double *arg2 = (double *) 0 ; double *arg3 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetMinSize",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -1240,14 +1383,10 @@ static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -1260,14 +1399,16 @@ static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *, PyObject *args, PyO double *arg2 = (double *) 0 ; double *arg3 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetProportion",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -1279,14 +1420,10 @@ static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -1299,14 +1436,16 @@ static PyObject *_wrap_ShapeRegion_GetSize(PyObject *, PyObject *args, PyObject double *arg2 = (double *) 0 ; double *arg3 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetSize",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -1318,14 +1457,10 @@ static PyObject *_wrap_ShapeRegion_GetSize(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -1338,14 +1473,16 @@ static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *, PyObject *args, PyObj double *arg2 = (double *) 0 ; double *arg3 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPosition",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -1357,14 +1494,10 @@ static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -1390,7 +1523,7 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -1571,7 +1704,7 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -1591,7 +1724,7 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1693,7 +1826,7 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -1719,7 +1852,7 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -1773,15 +1906,15 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AttachmentPoint",kwnames,&obj0,&obj1,&obj2)) goto fail; if (obj0) { - arg1 = (int) SWIG_AsInt(obj0); + arg1 = (int)SWIG_As_int(obj0); if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -1811,7 +1944,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_id_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_id = arg2; @@ -1836,7 +1969,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *, PyObject *args, PyOb SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->m_id); - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -1856,7 +1989,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_x = arg2; @@ -1881,7 +2014,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *, PyObject *args, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (double) ((arg1)->m_x); - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -1901,7 +2034,7 @@ static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_y = arg2; @@ -1926,7 +2059,7 @@ static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *, PyObject *args, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (double) ((arg1)->m_y); - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -1967,9 +2100,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeEvtHandler, 1); return resultobj; fail: return NULL; @@ -2084,7 +2215,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -2141,7 +2272,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -2169,7 +2300,7 @@ static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *, PyObject *arg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -2293,7 +2424,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *, PyObjec SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -2465,16 +2596,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -2510,16 +2641,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -2555,16 +2686,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -2596,9 +2727,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2645,16 +2776,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *, PyObject *ar PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -2664,7 +2795,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -2701,16 +2834,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *, PyObject *a PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -2748,18 +2881,18 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -2795,16 +2928,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -2840,16 +2973,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -2887,18 +3020,18 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -2934,16 +3067,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -2979,16 +3112,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -3033,13 +3166,13 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *, PyObject PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3146,7 +3279,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *, PyObject *a SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3188,18 +3321,18 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -3239,16 +3372,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -3288,16 +3421,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *, Py SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -3329,9 +3462,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3362,9 +3495,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3408,9 +3541,7 @@ static PyObject *_wrap_new_PyShape(PyObject *, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShape, 1); return resultobj; fail: return NULL; @@ -3454,14 +3585,16 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *, PyObject *args, PyO double *arg2 = (double *) 0 ; double *arg3 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMax",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -3473,14 +3606,10 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -3493,14 +3622,16 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *, PyObject *args, PyO double *arg2 = (double *) 0 ; double *arg3 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMin",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -3512,14 +3643,10 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -3537,7 +3664,9 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *, PyObject *args, PyO double *arg7 = (double *) 0 ; bool result; double temp6 ; + int res6 = 0 ; double temp7 ; + int res7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3547,18 +3676,18 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *, PyObject *args, PyO (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL }; - arg6 = &temp6; - arg7 = &temp7; + arg6 = &temp6; res6 = SWIG_NEWOBJ; + arg7 = &temp7; res7 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetPerimeterPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3567,15 +3696,13 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - PyObject *o = PyFloat_FromDouble((double) (*arg6)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg7)); - resultobj = t_output_helper(resultobj,o); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } + resultobj = t_output_helper(resultobj, ((res6 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg6)) : SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res7 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg7)) : SWIG_NewPointerObj((void*)(arg7), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -3602,7 +3729,7 @@ static PyObject *_wrap_PyShape_GetCanvas(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -3751,7 +3878,7 @@ static PyObject *_wrap_PyShape_GetX(PyObject *, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -3777,7 +3904,7 @@ static PyObject *_wrap_PyShape_GetY(PyObject *, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -3797,7 +3924,7 @@ static PyObject *_wrap_PyShape_SetX(PyObject *, PyObject *args, PyObject *kwargs if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3826,7 +3953,7 @@ static PyObject *_wrap_PyShape_SetY(PyObject *, PyObject *args, PyObject *kwargs if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3862,7 +3989,7 @@ static PyObject *_wrap_PyShape_GetParent(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -3919,7 +4046,7 @@ static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -3991,7 +4118,7 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDrawHandles",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4026,7 +4153,9 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4134,7 +4263,7 @@ static PyObject *_wrap_PyShape_GetEventHandler(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -4240,7 +4369,9 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4288,7 +4419,7 @@ static PyObject *_wrap_PyShape_Select(PyObject *, PyObject *args, PyObject *kwar if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { @@ -4325,11 +4456,11 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4365,7 +4496,9 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4391,7 +4524,9 @@ static PyObject *_wrap_PyShape_Selected(PyObject *, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4417,7 +4552,9 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4440,11 +4577,11 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4480,7 +4617,7 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -4502,10 +4639,10 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4537,9 +4674,9 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4561,14 +4698,16 @@ static PyObject *_wrap_PyShape_GetFixedSize(PyObject *, PyObject *args, PyObject bool *arg2 = (bool *) 0 ; bool *arg3 = (bool *) 0 ; bool temp2 ; + int res2 = 0 ; bool temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedSize",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -4580,14 +4719,10 @@ static PyObject *_wrap_PyShape_GetFixedSize(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyInt_FromLong((long) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyInt_FromLong((long) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_bool((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_bool, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_bool((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_bool, 0))); return resultobj; fail: return NULL; @@ -4613,7 +4748,9 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4639,7 +4776,9 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4659,7 +4798,7 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetSpaceAttachments",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4694,7 +4833,9 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4716,10 +4857,10 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetShadowMode",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4755,7 +4896,7 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -4771,7 +4912,9 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *, PyObject *args, PyObject *kwa double *arg5 = (double *) 0 ; bool result; int temp4 ; + int res4 = 0 ; double temp5 ; + int res5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -4779,14 +4922,14 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *, PyObject *args, PyObject *kwa (char *) "self",(char *) "x",(char *) "y", NULL }; - arg4 = &temp4; - arg5 = &temp5; + arg4 = &temp4; res4 = SWIG_NEWOBJ; + arg5 = &temp5; res5 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_HitTest",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4795,15 +4938,13 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - PyObject *o = PyInt_FromLong((long) (*arg4)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg5)); - resultobj = t_output_helper(resultobj,o); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0))); + resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -4823,7 +4964,7 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCentreResize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4858,7 +4999,9 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4878,7 +5021,7 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetMaintainAspectRatio",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4913,7 +5056,9 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4959,7 +5104,7 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDisableLabel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4994,7 +5139,9 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5014,7 +5161,7 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetAttachmentMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5049,7 +5196,7 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -5069,7 +5216,7 @@ static PyObject *_wrap_PyShape_SetId(PyObject *, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (long) SWIG_AsLong(obj1); + arg2 = (long)SWIG_As_long(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5104,7 +5251,7 @@ static PyObject *_wrap_PyShape_GetId(PyObject *, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromLong((long)result); + resultobj = SWIG_From_long((long)result); return resultobj; fail: return NULL; @@ -5212,7 +5359,7 @@ static PyObject *_wrap_PyShape_Show(PyObject *, PyObject *args, PyObject *kwargs if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Show",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5247,7 +5394,9 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5280,12 +5429,12 @@ static PyObject *_wrap_PyShape_Move(PyObject *, PyObject *args, PyObject *kwargs PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (bool) SWIG_AsBool(obj4); + arg5 = (bool)SWIG_As_bool(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -5514,12 +5663,12 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_SetSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (bool) SWIG_AsBool(obj3); + arg4 = (bool)SWIG_As_bool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -5551,9 +5700,9 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetAttachmentSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5642,7 +5791,9 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5677,19 +5828,19 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -5729,7 +5880,7 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -5885,7 +6036,7 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *, PyObject *args, PyObject * temp3 = True; } if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -5925,10 +6076,10 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFormatMode",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -5960,7 +6111,7 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -5970,7 +6121,7 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -6015,7 +6166,7 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *, PyObject *args, PyObject *kwa arg2 = NULL; } if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6047,7 +6198,7 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -6086,7 +6237,7 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *, PyObject *args, PyObjec temp2 = True; } if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6126,7 +6277,7 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -6168,7 +6319,7 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -6197,7 +6348,7 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *, PyObject *args, PyObjec temp2 = True; } if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6236,7 +6387,7 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionName",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6285,7 +6436,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); { if (temp2) delete arg2; @@ -6457,13 +6608,14 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *, PyObject *args, PyObject * wxPyShape *result; bool temp2 = False ; int temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "regionName", NULL }; - arg3 = &temp3; + arg3 = &temp3; res3 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegion",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -6480,12 +6632,10 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); - } - { - PyObject *o = PyInt_FromLong((long) (*arg3)); - resultobj = t_output_helper(resultobj,o); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0))); { if (temp2) delete arg2; @@ -6548,7 +6698,7 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -6605,7 +6755,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *, PyObject *args, wxPyLineShape *arg7 = (wxPyLineShape *) NULL ; bool result; double temp3 ; + int res3 = 0 ; double temp4 ; + int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6615,19 +6767,19 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *, PyObject *args, (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL }; - arg3 = &temp3; - arg4 = &temp4; + arg3 = &temp3; res3 = SWIG_NEWOBJ; + arg4 = &temp4; res4 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPosition",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; if (obj2) { - arg5 = (int) SWIG_AsInt(obj2); + arg5 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg6 = (int) SWIG_AsInt(obj3); + arg6 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { @@ -6641,15 +6793,13 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg4)); - resultobj = t_output_helper(resultobj,o); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -6675,7 +6825,7 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -6696,7 +6846,7 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AttachmentIsValid",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6705,7 +6855,9 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6749,7 +6901,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *, PyObject *a wxPyLineShape *arg7 = (wxPyLineShape *) NULL ; bool result; double temp3 ; + int res3 = 0 ; double temp4 ; + int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6759,19 +6913,19 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *, PyObject *a (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL }; - arg3 = &temp3; - arg4 = &temp4; + arg3 = &temp3; res3 = SWIG_NEWOBJ; + arg4 = &temp4; res4 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; if (obj2) { - arg5 = (int) SWIG_AsInt(obj2); + arg5 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg6 = (int) SWIG_AsInt(obj3); + arg6 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { @@ -6785,15 +6939,13 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } { - PyObject *o = PyFloat_FromDouble((double) (*arg4)); - resultobj = t_output_helper(resultobj,o); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -6832,9 +6984,9 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *, PyObject *args, arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; } - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -6876,7 +7028,7 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_AttachmentSortTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; @@ -6893,7 +7045,9 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6925,11 +7079,11 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *, PyObject *args, PyObject * SWIG_fail; } if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg4 = (bool) SWIG_AsBool(obj3); + arg4 = (bool)SWIG_As_bool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -6971,11 +7125,11 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *, PyObject *args, PyObject *k SWIG_fail; } if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg4 = (bool) SWIG_AsBool(obj3); + arg4 = (bool)SWIG_As_bool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -7021,9 +7175,9 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *, PyObject *arg } if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7032,7 +7186,9 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7081,7 +7237,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7127,7 +7283,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; @@ -7152,7 +7308,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7181,9 +7339,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; { arg4 = &temp4; @@ -7200,7 +7358,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7221,7 +7381,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetAttachmentLineCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7230,7 +7390,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -7250,7 +7410,7 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchNeckLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7285,7 +7445,7 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -7305,7 +7465,7 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStemLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7340,7 +7500,7 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -7360,7 +7520,7 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7395,7 +7555,7 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -7415,7 +7575,7 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (long) SWIG_AsLong(obj1); + arg2 = (long)SWIG_As_long(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7450,7 +7610,7 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromLong((long)result); + resultobj = SWIG_From_long((long)result); return resultobj; fail: return NULL; @@ -7471,7 +7631,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7480,7 +7640,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -7501,7 +7661,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7510,7 +7670,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -7536,7 +7696,9 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7566,7 +7728,9 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7590,11 +7754,11 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -7605,7 +7769,7 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -7698,11 +7862,11 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7737,7 +7901,7 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -7757,7 +7921,7 @@ static PyObject *_wrap_PyShape_SetRotation(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetRotation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8042,7 +8206,7 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *, PyObject *args, P SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -8214,16 +8378,16 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8259,16 +8423,16 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8304,16 +8468,16 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8345,9 +8509,9 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8394,16 +8558,16 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *, PyObject *args, PyObje PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -8413,7 +8577,9 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8450,16 +8616,16 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *, PyObject *args, PyObj PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -8497,18 +8663,18 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -8544,16 +8710,16 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8589,16 +8755,16 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8636,18 +8802,18 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -8683,16 +8849,16 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8728,16 +8894,16 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8782,13 +8948,13 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *, PyObject *args, Py PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8895,7 +9061,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *, PyObject *args, PyObj SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -8937,18 +9103,18 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *, PyObject *args, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -8988,16 +9154,16 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *, PyObject * SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -9037,16 +9203,16 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *, PyObject *ar SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -9078,9 +9244,9 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9111,9 +9277,9 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9152,7 +9318,7 @@ static PyObject *_wrap_new_PseudoMetaFile(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 1); } return resultobj; fail: @@ -9209,9 +9375,9 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *, PyObject *args, PyObject PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9301,9 +9467,9 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9334,9 +9500,9 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_ScaleTo",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9367,9 +9533,9 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9402,11 +9568,11 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9457,7 +9623,9 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -9555,7 +9723,7 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetRotateable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9590,7 +9758,9 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9612,9 +9782,9 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9783,7 +9953,7 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9818,7 +9988,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -9844,7 +10014,9 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9942,7 +10114,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *, PyObject arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10026,9 +10198,9 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *, PyObject *args arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10163,18 +10335,17 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *, PyObject *args, PyOb wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points", NULL + (char *) "self",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3); @@ -10183,8 +10354,14 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -10198,20 +10375,19 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *, PyObject *args, Py PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL + (char *) "self",(char *) "points",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } + if (obj2) { + arg4 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -10222,8 +10398,14 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -10235,18 +10417,17 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *, PyObject *args, PyO wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points", NULL + (char *) "self",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSpline(arg2,arg3); @@ -10255,8 +10436,14 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -10352,7 +10539,7 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *, PyObject *args, PyObjec arg2 = NULL; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -10401,7 +10588,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *, PyObject *args, PyObj arg2 = NULL; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -10544,7 +10731,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10580,11 +10767,11 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyRectangleShape",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - arg1 = (double) SWIG_AsDouble(obj0); + arg1 = (double)SWIG_As_double(obj0); if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -10645,7 +10832,7 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10680,7 +10867,7 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -10803,7 +10990,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *, PyObject SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -10975,16 +11162,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -11020,16 +11207,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -11065,16 +11252,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -11106,9 +11293,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11155,16 +11342,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *, PyObject *arg PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -11174,7 +11361,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11211,16 +11400,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *, PyObject *ar PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -11258,18 +11447,18 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -11305,16 +11494,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -11350,16 +11539,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -11397,18 +11586,18 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -11444,16 +11633,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -11489,16 +11678,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -11543,13 +11732,13 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *, PyObject PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11656,7 +11845,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *, PyObject *ar SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -11698,18 +11887,18 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *, PyObje SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -11749,16 +11938,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *, P SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -11798,16 +11987,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *, PyO SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -11839,9 +12028,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11872,9 +12061,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11926,19 +12115,19 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *, PyObject *args, PyObject * SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj2) { - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -11999,7 +12188,7 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12131,7 +12320,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *, PyObject * SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -12303,16 +12492,16 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -12348,16 +12537,16 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -12393,16 +12582,16 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -12434,9 +12623,9 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12483,16 +12672,16 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -12502,7 +12691,9 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12539,16 +12730,16 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *, PyObject *args PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -12586,18 +12777,18 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -12633,16 +12824,16 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -12678,16 +12869,16 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -12725,18 +12916,18 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -12772,16 +12963,16 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -12817,16 +13008,16 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -12871,13 +13062,13 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *, PyObject *a PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12984,7 +13175,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *, PyObject *args SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -13026,18 +13217,18 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -13077,16 +13268,16 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *, PyO SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -13126,16 +13317,16 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -13167,9 +13358,9 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13200,9 +13391,9 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13533,7 +13724,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *, PyObject *a SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -13705,16 +13896,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -13750,16 +13941,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -13795,16 +13986,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -13836,9 +14027,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13885,16 +14076,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -13904,7 +14095,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13941,16 +14134,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -13988,18 +14181,18 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -14035,16 +14228,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -14080,16 +14273,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -14127,18 +14320,18 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -14174,16 +14367,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -14219,16 +14412,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -14273,13 +14466,13 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *, PyObject *ar PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14386,7 +14579,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *, PyObject *args, SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14428,18 +14621,18 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -14479,16 +14672,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *, PyOb SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -14528,16 +14721,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *, PyObje SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -14569,9 +14762,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14602,9 +14795,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14789,7 +14982,7 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14827,9 +15020,9 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *, PyObject *args, arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14891,18 +15084,17 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *, PyObject *args, PyObje wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points", NULL + (char *) "self",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3); @@ -14911,8 +15103,14 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -14958,20 +15156,19 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *, PyObject *args, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL + (char *) "self",(char *) "points",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } + if (obj2) { + arg4 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14982,8 +15179,14 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -15040,7 +15243,7 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *, PyObject *a arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15063,18 +15266,17 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *, PyObject *args, PyObj wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points", NULL + (char *) "self",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSpline(arg2,arg3); @@ -15083,8 +15285,14 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -15156,7 +15364,7 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -15211,7 +15419,7 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -15245,7 +15453,9 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -15277,11 +15487,11 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15374,7 +15584,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15422,7 +15632,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *, PyObject *args, Py arg2 = NULL; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -15522,7 +15732,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *, PyObject *args, PyOb arg2 = NULL; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -15586,9 +15796,9 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15617,7 +15827,7 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetSaveToFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15648,9 +15858,9 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15782,7 +15992,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *, PyObject *ar SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -15954,16 +16164,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -15999,16 +16209,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -16044,16 +16254,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -16085,9 +16295,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16134,16 +16344,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *, PyObject *args, P PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -16153,7 +16363,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16190,16 +16402,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -16237,18 +16449,18 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -16284,16 +16496,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -16329,16 +16541,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -16376,18 +16588,18 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -16423,16 +16635,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -16468,16 +16680,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -16522,13 +16734,13 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *, PyObject *arg PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16635,7 +16847,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *, PyObject *args, SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16677,18 +16889,18 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *, PyObject * SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -16728,16 +16940,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -16777,16 +16989,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *, PyObjec SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -16818,9 +17030,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16851,9 +17063,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16890,7 +17102,7 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail; - arg1 = (int) SWIG_AsInt(obj0); + arg1 = (int)SWIG_As_int(obj0); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -16903,7 +17115,7 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 1); } return resultobj; fail: @@ -16930,7 +17142,9 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16952,9 +17166,9 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_SetSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16986,9 +17200,9 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_Equals",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16997,7 +17211,9 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17123,7 +17339,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -17149,7 +17365,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -17162,7 +17378,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -17188,7 +17404,7 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -17202,7 +17418,7 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -17258,7 +17474,9 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17343,7 +17561,7 @@ static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -17447,7 +17665,9 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17599,7 +17819,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *, PyObject SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -17771,16 +17991,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -17816,16 +18036,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -17861,16 +18081,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -17902,9 +18122,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17951,16 +18171,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *, PyObject *arg PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -17970,7 +18190,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18007,16 +18229,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *, PyObject *ar PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -18054,18 +18276,18 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -18101,16 +18323,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -18146,16 +18368,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -18193,18 +18415,18 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -18240,16 +18462,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -18285,16 +18507,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -18339,13 +18561,13 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *, PyObject PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18452,7 +18674,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *, PyObject *ar SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -18494,18 +18716,18 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *, PyObje SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -18545,16 +18767,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *, P SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -18594,16 +18816,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *, PyO SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -18635,9 +18857,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18668,9 +18890,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18706,11 +18928,11 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyDividedShape",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - arg1 = (double) SWIG_AsDouble(obj0); + arg1 = (double)SWIG_As_double(obj0); if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18924,7 +19146,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *, PyObject * SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -19096,16 +19318,16 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -19141,16 +19363,16 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -19186,16 +19408,16 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -19227,9 +19449,9 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19276,16 +19498,16 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -19295,7 +19517,9 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -19332,16 +19556,16 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *, PyObject *args PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -19379,18 +19603,18 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -19426,16 +19650,16 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -19471,16 +19695,16 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -19518,18 +19742,18 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -19565,16 +19789,16 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -19610,16 +19834,16 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -19664,13 +19888,13 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *, PyObject *a PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19777,7 +20001,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *, PyObject *args SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -19819,18 +20043,18 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -19870,16 +20094,16 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *, PyO SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -19919,16 +20143,16 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -19960,9 +20184,9 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19993,9 +20217,9 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20033,9 +20257,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDivisionShape, 1); return resultobj; fail: return NULL; @@ -20088,9 +20310,9 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustBottom",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20121,9 +20343,9 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustLeft",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20154,9 +20376,9 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustRight",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20187,9 +20409,9 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustTop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20218,7 +20440,7 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_Divide",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20247,7 +20469,7 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_EditEdge",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20283,7 +20505,7 @@ static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -20310,7 +20532,7 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -20337,7 +20559,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -20423,7 +20645,7 @@ static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -20451,7 +20673,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -20502,11 +20724,11 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDivisionShape_ResizeAdjoining",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (bool) SWIG_AsBool(obj3); + arg4 = (bool)SWIG_As_bool(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20537,9 +20759,9 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20597,7 +20819,7 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetHandleSide",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20988,7 +21210,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *, PyObject SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -21160,16 +21382,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21205,16 +21427,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21250,16 +21472,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21291,9 +21513,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21340,16 +21562,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *, PyObject *args PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -21359,7 +21581,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21396,16 +21620,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *, PyObject *arg PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -21443,18 +21667,18 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -21490,16 +21714,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21535,16 +21759,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21582,18 +21806,18 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -21629,16 +21853,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21674,16 +21898,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21728,13 +21952,13 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *, PyObject * PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21841,7 +22065,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *, PyObject *arg SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -21883,18 +22107,18 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *, PyObjec SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -21934,16 +22158,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *, Py SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -21983,16 +22207,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *, PyOb SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -22024,9 +22248,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22057,9 +22281,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22095,11 +22319,11 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEllipseShape",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - arg1 = (double) SWIG_AsDouble(obj0); + arg1 = (double)SWIG_As_double(obj0); if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22238,7 +22462,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *, PyObject * SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -22410,16 +22634,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -22455,16 +22679,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -22500,16 +22724,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -22541,9 +22765,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22590,16 +22814,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -22609,7 +22833,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22646,16 +22872,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *, PyObject *args PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -22693,18 +22919,18 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -22740,16 +22966,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -22785,16 +23011,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -22832,18 +23058,18 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -22879,16 +23105,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -22924,16 +23150,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -22978,13 +23204,13 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *, PyObject *a PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23091,7 +23317,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *, PyObject *args SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -23133,18 +23359,18 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -23184,16 +23410,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *, PyO SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -23233,16 +23459,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -23274,9 +23500,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23307,9 +23533,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23343,7 +23569,7 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyCircleShape",kwnames,&obj0)) goto fail; if (obj0) { - arg1 = (double) SWIG_AsDouble(obj0); + arg1 = (double)SWIG_As_double(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -23482,7 +23708,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *, PyObject *a SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -23654,16 +23880,16 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -23699,16 +23925,16 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -23744,16 +23970,16 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -23785,9 +24011,9 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23834,16 +24060,16 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -23853,7 +24079,9 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23890,16 +24118,16 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -23937,18 +24165,18 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -23984,16 +24212,16 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -24029,16 +24257,16 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -24076,18 +24304,18 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -24123,16 +24351,16 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -24168,16 +24396,16 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -24222,13 +24450,13 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *, PyObject *ar PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24335,7 +24563,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *, PyObject *args, SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -24377,18 +24605,18 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -24428,16 +24656,16 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *, PyOb SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -24477,16 +24705,16 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *, PyObje SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -24518,9 +24746,9 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24551,9 +24779,9 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24601,19 +24829,19 @@ static PyObject *_wrap_new_ArrowHead(PyObject *, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOOO:new_ArrowHead",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if (obj0) { - arg1 = (int) SWIG_AsInt(obj0); + arg1 = (int)SWIG_As_int(obj0); if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { @@ -24628,7 +24856,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *, PyObject *args, PyObject *kwarg SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj6) { - arg7 = (long) SWIG_AsLong(obj6); + arg7 = (long)SWIG_As_long(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -24639,7 +24867,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *, PyObject *args, PyObject *kwarg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 1); } { if (temp5) @@ -24699,7 +24927,7 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -24725,7 +24953,7 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -24745,7 +24973,7 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24780,7 +25008,7 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -24806,7 +25034,7 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -24832,7 +25060,7 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -24858,7 +25086,7 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -24910,7 +25138,7 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetXOffset",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24939,7 +25167,7 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetYOffset",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24975,7 +25203,7 @@ static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -25002,7 +25230,7 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromLong((long)result); + resultobj = SWIG_From_long((long)result); return resultobj; fail: return NULL; @@ -25028,7 +25256,7 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -25054,7 +25282,7 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -25074,7 +25302,7 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25103,7 +25331,7 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25206,18 +25434,18 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:PyLineShape_AddArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { @@ -25232,7 +25460,7 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *, PyObject *args, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj7) { - arg8 = (long) SWIG_AsLong(obj7); + arg8 = (long)SWIG_As_long(obj7); if (PyErr_Occurred()) SWIG_fail; } { @@ -25277,7 +25505,7 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *, PyObject *args, P if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg3 = obj2; - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25320,7 +25548,9 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -25349,7 +25579,7 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -25394,9 +25624,9 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *, PyObject *args, PyObjec } if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxArrowHead, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (bool) SWIG_AsBool(obj4); + arg5 = (bool)SWIG_As_bool(obj4); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25426,7 +25656,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (long) SWIG_AsLong(obj1); + arg2 = (long)SWIG_As_long(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25435,7 +25665,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -25459,7 +25691,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); @@ -25473,7 +25705,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp3) delete arg3; @@ -25507,7 +25741,9 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -25576,9 +25812,9 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *, PyObject *args, PyObje } if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25622,9 +25858,9 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *, PyObject *args, PyObj } if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25654,7 +25890,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_FindArrowHeadId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (long) SWIG_AsLong(obj1); + arg2 = (long)SWIG_As_long(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25664,7 +25900,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -25689,7 +25925,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); @@ -25704,7 +25940,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } { if (temp3) @@ -25728,18 +25964,22 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *, PyObject *args, double *arg4 = (double *) 0 ; double *arg5 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; double temp4 ; + int res4 = 0 ; double temp5 ; + int res5 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; - arg4 = &temp4; - arg5 = &temp5; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; + arg4 = &temp4; res4 = SWIG_NEWOBJ; + arg5 = &temp5; res5 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindLineEndPoints",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -25751,22 +25991,14 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg4)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg5)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -25789,9 +26021,9 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindLinePosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25800,7 +26032,7 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -25826,7 +26058,7 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -25841,7 +26073,9 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *, PyObject *args, PyObject int *arg4 = (int *) 0 ; bool arg5 ; int temp3 ; + int res3 = 0 ; int temp4 ; + int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -25849,14 +26083,14 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *, PyObject *args, PyObject (char *) "self",(char *) "image",(char *) "incoming", NULL }; - arg3 = &temp3; - arg4 = &temp4; + arg3 = &temp3; res3 = SWIG_NEWOBJ; + arg4 = &temp4; res4 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindNth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg5 = (bool) SWIG_AsBool(obj2); + arg5 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25866,14 +26100,10 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyInt_FromLong((long) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyInt_FromLong((long) (*arg4)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0))); + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0))); return resultobj; fail: return NULL; @@ -25899,7 +26129,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -25925,7 +26155,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -25940,18 +26170,22 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *, PyObject *args, PyObject double *arg4 = (double *) 0 ; double *arg5 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; double temp4 ; + int res4 = 0 ; double temp5 ; + int res5 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; - arg4 = &temp4; - arg5 = &temp5; + arg2 = &temp2; res2 = SWIG_NEWOBJ; + arg3 = &temp3; res3 = SWIG_NEWOBJ; + arg4 = &temp4; res4 = SWIG_NEWOBJ; + arg5 = &temp5; res5 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetEnds",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -25963,22 +26197,14 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg4)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg5)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -26005,7 +26231,7 @@ static PyObject *_wrap_PyLineShape_GetFrom(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -26020,19 +26246,21 @@ static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *, PyObject *args, double *arg3 = (double *) 0 ; double *arg4 = (double *) 0 ; double temp3 ; + int res3 = 0 ; double temp4 ; + int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position", NULL }; - arg3 = &temp3; - arg4 = &temp4; + arg3 = &temp3; res3 = SWIG_NEWOBJ; + arg4 = &temp4; res4 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetLabelPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26042,14 +26270,10 @@ static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg4)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -26106,7 +26330,7 @@ static PyObject *_wrap_PyLineShape_GetTo(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -26191,7 +26415,9 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26217,7 +26443,9 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26237,7 +26465,7 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26279,6 +26507,34 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *, PyObject *ar } +static PyObject *_wrap_PyLineShape_SetLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyLineShape *arg1 = (wxPyLineShape *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "list", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetLineControlPoints",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = obj1; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPyLineShape_SetLineControlPoints(arg1,arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyLineShape *arg1 = (wxPyLineShape *) 0 ; @@ -26292,7 +26548,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26323,9 +26579,9 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAttachments",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26354,7 +26610,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentTo",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26389,13 +26645,13 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_SetEnds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26453,7 +26709,7 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetIgnoreOffsets",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26482,7 +26738,7 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetSpline",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26598,9 +26854,9 @@ static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26631,9 +26887,9 @@ static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentType",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26663,7 +26919,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26672,7 +26928,9 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26693,7 +26951,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentType",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26702,7 +26960,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -26728,7 +26986,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -26754,7 +27012,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -26852,7 +27110,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *, PyObject *arg SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -27024,16 +27282,16 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -27069,16 +27327,16 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -27114,16 +27372,16 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -27155,9 +27413,9 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27204,16 +27462,16 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *, PyObject *args, Py PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -27223,7 +27481,9 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27260,16 +27520,16 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *, PyObject *args, P PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -27307,18 +27567,18 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -27354,16 +27614,16 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -27399,16 +27659,16 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -27446,18 +27706,18 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -27493,16 +27753,16 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -27538,16 +27798,16 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -27592,13 +27852,13 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *, PyObject *args PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27705,7 +27965,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *, PyObject *args, P SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -27747,18 +28007,18 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *, PyObject *a SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -27798,16 +28058,16 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *, PyObje SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -27847,16 +28107,16 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -27888,9 +28148,9 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27921,9 +28181,9 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28042,7 +28302,7 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -28098,7 +28358,7 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -28186,7 +28446,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -28212,7 +28472,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -28232,7 +28492,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28261,7 +28521,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28393,7 +28653,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *, PyObject * SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -28565,16 +28825,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -28610,16 +28870,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -28655,16 +28915,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -28696,9 +28956,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28745,16 +29005,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -28764,7 +29024,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -28801,16 +29063,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *, PyObject *args PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -28848,18 +29110,18 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -28895,16 +29157,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -28940,16 +29202,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -28987,18 +29249,18 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -29034,16 +29296,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -29079,16 +29341,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -29133,13 +29395,13 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *, PyObject *a PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29246,7 +29508,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *, PyObject *args SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -29288,18 +29550,18 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -29339,16 +29601,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *, PyO SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -29388,16 +29650,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *, PyObj SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -29429,9 +29691,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29462,9 +29724,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29500,11 +29762,11 @@ static PyObject *_wrap_new_PyTextShape(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyTextShape",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - arg1 = (double) SWIG_AsDouble(obj0); + arg1 = (double)SWIG_As_double(obj0); if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -29668,7 +29930,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *, PyObject *arg SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -29840,16 +30102,16 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -29885,16 +30147,16 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -29930,16 +30192,16 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -29971,9 +30233,9 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30020,16 +30282,16 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *, PyObject *args, Py PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -30039,7 +30301,9 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -30076,16 +30340,16 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *, PyObject *args, P PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; if (obj6) { - arg7 = (bool) SWIG_AsBool(obj6); + arg7 = (bool)SWIG_As_bool(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -30123,18 +30387,18 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -30170,16 +30434,16 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -30215,16 +30479,16 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -30262,18 +30526,18 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -30309,16 +30573,16 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -30354,16 +30618,16 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -30408,13 +30672,13 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *, PyObject *args PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30521,7 +30785,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *, PyObject *args, P SWIG_fail; } if (obj2) { - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -30563,18 +30827,18 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *, PyObject *a SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (bool) SWIG_AsBool(obj2); + arg3 = (bool)SWIG_As_bool(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - arg7 = (int) SWIG_AsInt(obj6); + arg7 = (int)SWIG_As_int(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -30614,16 +30878,16 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *, PyObje SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -30663,16 +30927,16 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *, PyObject SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - arg6 = (int) SWIG_AsInt(obj5); + arg6 = (int)SWIG_As_int(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -30704,9 +30968,9 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30737,9 +31001,9 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30778,7 +31042,7 @@ static PyObject *_wrap_new_Diagram(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 1); } return resultobj; fail: @@ -30908,13 +31172,13 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *, PyObject *args, PyObject PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (double) SWIG_AsDouble(obj4); + arg5 = (double)SWIG_As_double(obj4); if (PyErr_Occurred()) SWIG_fail; - arg6 = (double) SWIG_AsDouble(obj5); + arg6 = (double)SWIG_As_double(obj5); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30944,7 +31208,7 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_FindShape",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (long) SWIG_AsLong(obj1); + arg2 = (long)SWIG_As_long(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30954,7 +31218,7 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } return resultobj; fail: @@ -30982,7 +31246,7 @@ static PyObject *_wrap_Diagram_GetCanvas(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -31009,7 +31273,7 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -31035,7 +31299,7 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromDouble((double)result); + resultobj = SWIG_From_double((double)result); return resultobj; fail: return NULL; @@ -31061,7 +31325,7 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + resultobj = SWIG_From_int((int)result); return resultobj; fail: return NULL; @@ -31113,7 +31377,9 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -31139,7 +31405,9 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -31339,7 +31607,7 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetGridSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31368,7 +31636,7 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetMouseTolerance",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31397,7 +31665,7 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetQuickEditMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31426,7 +31694,7 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetSnapToGrid",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31455,7 +31723,7 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_ShowAll",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31477,7 +31745,9 @@ static PyObject *_wrap_Diagram_Snap(PyObject *, PyObject *args, PyObject *kwargs double *arg2 = (double *) 0 ; double *arg3 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -31489,14 +31759,20 @@ static PyObject *_wrap_Diagram_Snap(PyObject *, PyObject *args, PyObject *kwargs if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { - temp2 = PyFloat_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - arg2 = &temp2; + if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_double,0) != -1)) { + temp2 = SWIG_As_double(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg2 = &temp2; + res2 = SWIG_NEWOBJ; + } } { - temp3 = PyFloat_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - arg3 = &temp3; + if (!(SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double,0) != -1)) { + temp3 = SWIG_As_double(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg3 = &temp3; + res3 = SWIG_NEWOBJ; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31506,14 +31782,10 @@ static PyObject *_wrap_Diagram_Snap(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -31558,7 +31830,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *, PyObject *args, PyObject *k SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { @@ -31574,7 +31846,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *, PyObject *args, PyObject *k } } if (obj4) { - arg5 = (long) SWIG_AsLong(obj4); + arg5 = (long)SWIG_As_long(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { @@ -31585,15 +31857,14 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *, PyObject *args, PyObject *k } } { + if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShapeCanvas *)new wxPyShapeCanvas(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeCanvas, 1); { if (temp6) delete arg6; @@ -31684,6 +31955,7 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *, PyObject *args, PyObj wxPyShape *arg6 = (wxPyShape *) NULL ; wxPyShape *result; int temp4 ; + int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -31693,13 +31965,13 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *, PyObject *args, PyObj (char *) "self",(char *) "x1",(char *) "y",(char *) "info",(char *) "notImage", NULL }; - arg4 = &temp4; + arg4 = &temp4; res4 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **)(&arg5),SWIGTYPE_p_wxClassInfo, @@ -31717,12 +31989,10 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); - } - { - PyObject *o = PyInt_FromLong((long) (*arg4)); - resultobj = t_output_helper(resultobj,o); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0))); return resultobj; fail: return NULL; @@ -31738,6 +32008,7 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *, PyObjec int arg5 ; wxPyShape *result; int temp4 ; + int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -31746,15 +32017,15 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *, PyObjec (char *) "self",(char *) "x1",(char *) "y",(char *) "op", NULL }; - arg4 = &temp4; + arg4 = &temp4; res4 = SWIG_NEWOBJ; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg5 = (int) SWIG_AsInt(obj3); + arg5 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31764,12 +32035,10 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxShapeEvtHandler(result); - } - { - PyObject *o = PyInt_FromLong((long) (*arg4)); - resultobj = t_output_helper(resultobj,o); + resultobj = wxPyMake_wxShapeEvtHandler(result, 0); } + resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ? + SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0))); return resultobj; fail: return NULL; @@ -31796,7 +32065,7 @@ static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -31823,7 +32092,9 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -31876,12 +32147,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -31915,12 +32186,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -31954,12 +32225,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -31993,12 +32264,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -32034,14 +32305,14 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -32077,14 +32348,14 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (bool) SWIG_AsBool(obj1); + arg2 = (bool)SWIG_As_bool(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (double) SWIG_AsDouble(obj3); + arg4 = (double)SWIG_As_double(obj3); if (PyErr_Occurred()) SWIG_fail; if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); + arg5 = (int)SWIG_As_int(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -32118,12 +32389,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -32157,12 +32428,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (double) SWIG_AsDouble(obj1); + arg2 = (double)SWIG_As_double(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (double) SWIG_AsDouble(obj2); + arg3 = (double)SWIG_As_double(obj2); if (PyErr_Occurred()) SWIG_fail; if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); + arg4 = (int)SWIG_As_int(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -32277,7 +32548,9 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *, PyObject *args, PyObject * double *arg2 = (double *) 0 ; double *arg3 = (double *) 0 ; double temp2 ; + int res2 = 0 ; double temp3 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -32289,14 +32562,20 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { - temp2 = PyFloat_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - arg2 = &temp2; + if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_double,0) != -1)) { + temp2 = SWIG_As_double(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg2 = &temp2; + res2 = SWIG_NEWOBJ; + } } { - temp3 = PyFloat_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - arg3 = &temp3; + if (!(SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double,0) != -1)) { + temp3 = SWIG_As_double(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg3 = &temp3; + res3 = SWIG_NEWOBJ; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32306,14 +32585,10 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyFloat_FromDouble((double) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyFloat_FromDouble((double) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } + resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0))); + resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ? + SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0))); return resultobj; fail: return NULL; @@ -32335,6 +32610,7 @@ static PyObject *_wrap_OGLInitialize(PyObject *, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":OGLInitialize",kwnames)) goto fail; { + if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); wxOGLInitialize(); @@ -32356,6 +32632,7 @@ static PyObject *_wrap_OGLCleanUp(PyObject *, PyObject *args, PyObject *kwargs) if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":OGLCleanUp",kwnames)) goto fail; { + if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); wxOGLCleanUp(); @@ -33074,6 +33351,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyLineShape_IsSpline", (PyCFunction) _wrap_PyLineShape_IsSpline, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"PyLineShape_MakeLineControlPoints", (PyCFunction) _wrap_PyLineShape_MakeLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"PyLineShape_GetLineControlPoints", (PyCFunction) _wrap_PyLineShape_GetLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"PyLineShape_SetLineControlPoints", (PyCFunction) _wrap_PyLineShape_SetLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"PyLineShape_SetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_SetAttachmentFrom, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"PyLineShape_SetAttachments", (PyCFunction) _wrap_PyLineShape_SetAttachments, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"PyLineShape_SetAttachmentTo", (PyCFunction) _wrap_PyLineShape_SetAttachmentTo, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -33254,6 +33532,9 @@ static void *_p_wxScrolledWindowTo_p_wxPanel(void *x) { static void *_p_wxPyVScrolledWindowTo_p_wxPanel(void *x) { return (void *)((wxPanel *) ((wxPyVScrolledWindow *) x)); } +static void *_p_wxPyScrolledWindowTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +} static void *_p_wxPyVListBoxTo_p_wxPanel(void *x) { return (void *)((wxPanel *) (wxPyVScrolledWindow *) ((wxPyVListBox *) x)); } @@ -33275,6 +33556,9 @@ static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) { static void *_p_wxPyShapeCanvasTo_p_wxPanel(void *x) { return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyShapeCanvas *) x)); } +static void *_p_wxPyScrolledWindowTo_p_wxScrolledWindow(void *x) { + return (void *)((wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +} static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) { return (void *)((wxScrolledWindow *) ((wxPreviewCanvas *) x)); } @@ -33353,6 +33637,9 @@ static void *_p_wxSplitterWindowTo_p_wxWindow(void *x) { static void *_p_wxSashWindowTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxSashWindow *) x)); } +static void *_p_wxPyScrolledWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +} static void *_p_wxControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxControl *) x)); } @@ -33758,6 +34045,9 @@ static void *_p_wxPyVScrolledWindowTo_p_wxObject(void *x) { static void *_p_wxMDIClientWindowTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMDIClientWindow *) x)); } +static void *_p_wxPyScrolledWindowTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +} static void *_p_wxSashEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxSashEvent *) x)); } @@ -33992,6 +34282,9 @@ static void *_p_wxTopLevelWindowTo_p_wxEvtHandler(void *x) { static void *_p_wxMDIClientWindowTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *) ((wxMDIClientWindow *) x)); } +static void *_p_wxPyScrolledWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +} static void *_p_wxControlTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); } @@ -34131,21 +34424,21 @@ static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0, 0, 0, 0},{"_p_wxArrowHead", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0, 0, 0, 0},{"_p_wxStringList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0, 0, 0, 0},{"_p_bool", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxList[] = {{"_p_wxList", 0, "wxList *", 0, 0, 0, 0},{"_p_wxList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0, 0, 0, 0},{"_p_double", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0, 0, 0, 0},{"_p_wxPyDivisionShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0, 0, 0, 0},{"_p_wxPyDrawnShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0, 0, 0, 0},{"_p_wxPyPolygonShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyBitmapShape[] = {{"_p_wxPyBitmapShape", 0, "wxPyBitmapShape *", 0, 0, 0, 0},{"_p_wxPyBitmapShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyShapeEvtHandler[] = {{"_p_wxPyShapeEvtHandler", 0, "wxPyShapeEvtHandler *", 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyEllipseShape[] = {{"_p_wxPyEllipseShape", 0, "wxPyEllipseShape *", 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyEllipseShape, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyShapeCanvas[] = {{"_p_wxPyShapeCanvas", 0, "wxPyShapeCanvas *", 0, 0, 0, 0},{"_p_wxPyShapeCanvas", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -34238,70 +34531,70 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); - PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_FromInt((int)oglMETAFLAGS_OUTLINE)); - PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_FromInt((int)oglMETAFLAGS_ATTACHMENTS)); - PyDict_SetItemString(d,"KEY_SHIFT", SWIG_FromInt((int)KEY_SHIFT)); - PyDict_SetItemString(d,"KEY_CTRL", SWIG_FromInt((int)KEY_CTRL)); - PyDict_SetItemString(d,"ARROW_NONE", SWIG_FromInt((int)ARROW_NONE)); - PyDict_SetItemString(d,"ARROW_END", SWIG_FromInt((int)ARROW_END)); - PyDict_SetItemString(d,"ARROW_BOTH", SWIG_FromInt((int)ARROW_BOTH)); - PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_FromInt((int)ARROW_MIDDLE)); - PyDict_SetItemString(d,"ARROW_START", SWIG_FromInt((int)ARROW_START)); - PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_FromInt((int)ARROW_HOLLOW_CIRCLE)); - PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_FromInt((int)ARROW_FILLED_CIRCLE)); - PyDict_SetItemString(d,"ARROW_ARROW", SWIG_FromInt((int)ARROW_ARROW)); - PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_FromInt((int)ARROW_SINGLE_OBLIQUE)); - PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_FromInt((int)ARROW_DOUBLE_OBLIQUE)); - PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_FromInt((int)ARROW_METAFILE)); - PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_FromInt((int)ARROW_POSITION_END)); - PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_FromInt((int)ARROW_POSITION_START)); - PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_FromInt((int)CONTROL_POINT_VERTICAL)); - PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_FromInt((int)CONTROL_POINT_HORIZONTAL)); - PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_FromInt((int)CONTROL_POINT_DIAGONAL)); - PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_TO)); - PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_FROM)); - PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_FromInt((int)CONTROL_POINT_LINE)); - PyDict_SetItemString(d,"FORMAT_NONE", SWIG_FromInt((int)FORMAT_NONE)); - PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_FromInt((int)FORMAT_CENTRE_HORIZ)); - PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_FromInt((int)FORMAT_CENTRE_VERT)); - PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_FromInt((int)FORMAT_SIZE_TO_CONTENTS)); - PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_FromInt((int)LINE_ALIGNMENT_HORIZ)); - PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_FromInt((int)LINE_ALIGNMENT_VERT)); - PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE)); - PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_FromInt((int)LINE_ALIGNMENT_NONE)); - PyDict_SetItemString(d,"SHADOW_NONE", SWIG_FromInt((int)SHADOW_NONE)); - PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_FromInt((int)SHADOW_LEFT)); - PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_FromInt((int)SHADOW_RIGHT)); - PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_FromInt((int)OP_CLICK_LEFT)); - PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_FromInt((int)OP_CLICK_RIGHT)); - PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_FromInt((int)OP_DRAG_LEFT)); - PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_FromInt((int)OP_DRAG_RIGHT)); - PyDict_SetItemString(d,"OP_ALL", SWIG_FromInt((int)OP_ALL)); - PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_FromInt((int)ATTACHMENT_MODE_NONE)); - PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_FromInt((int)ATTACHMENT_MODE_EDGE)); - PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_FromInt((int)ATTACHMENT_MODE_BRANCHING)); - PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_FromInt((int)BRANCHING_ATTACHMENT_NORMAL)); - PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_FromInt((int)BRANCHING_ATTACHMENT_BLOB)); - PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY)); - PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY)); - PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_BOTH)); - PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_FromInt((int)gyCONSTRAINT_LEFT_OF)); - PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_FromInt((int)gyCONSTRAINT_RIGHT_OF)); - PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_FromInt((int)gyCONSTRAINT_ABOVE)); - PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_FromInt((int)gyCONSTRAINT_BELOW)); - PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_TOP)); - PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM)); - PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT)); - PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT)); - PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP)); - PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM)); - PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT)); - PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT)); - PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_FromInt((int)DIVISION_SIDE_NONE)); - PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_FromInt((int)DIVISION_SIDE_LEFT)); - PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_FromInt((int)DIVISION_SIDE_TOP)); - PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_FromInt((int)DIVISION_SIDE_RIGHT)); - PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_FromInt((int)DIVISION_SIDE_BOTTOM)); + PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_From_int((int)oglMETAFLAGS_OUTLINE)); + PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_From_int((int)oglMETAFLAGS_ATTACHMENTS)); + PyDict_SetItemString(d,"KEY_SHIFT", SWIG_From_int((int)KEY_SHIFT)); + PyDict_SetItemString(d,"KEY_CTRL", SWIG_From_int((int)KEY_CTRL)); + PyDict_SetItemString(d,"ARROW_NONE", SWIG_From_int((int)ARROW_NONE)); + PyDict_SetItemString(d,"ARROW_END", SWIG_From_int((int)ARROW_END)); + PyDict_SetItemString(d,"ARROW_BOTH", SWIG_From_int((int)ARROW_BOTH)); + PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_From_int((int)ARROW_MIDDLE)); + PyDict_SetItemString(d,"ARROW_START", SWIG_From_int((int)ARROW_START)); + PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_From_int((int)ARROW_HOLLOW_CIRCLE)); + PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_From_int((int)ARROW_FILLED_CIRCLE)); + PyDict_SetItemString(d,"ARROW_ARROW", SWIG_From_int((int)ARROW_ARROW)); + PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_From_int((int)ARROW_SINGLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_From_int((int)ARROW_DOUBLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_From_int((int)ARROW_METAFILE)); + PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_From_int((int)ARROW_POSITION_END)); + PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_From_int((int)ARROW_POSITION_START)); + PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_From_int((int)CONTROL_POINT_VERTICAL)); + PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_From_int((int)CONTROL_POINT_HORIZONTAL)); + PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_From_int((int)CONTROL_POINT_DIAGONAL)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_From_int((int)CONTROL_POINT_ENDPOINT_TO)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_From_int((int)CONTROL_POINT_ENDPOINT_FROM)); + PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_From_int((int)CONTROL_POINT_LINE)); + PyDict_SetItemString(d,"FORMAT_NONE", SWIG_From_int((int)FORMAT_NONE)); + PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_From_int((int)FORMAT_CENTRE_HORIZ)); + PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_From_int((int)FORMAT_CENTRE_VERT)); + PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_From_int((int)FORMAT_SIZE_TO_CONTENTS)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_From_int((int)LINE_ALIGNMENT_HORIZ)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_From_int((int)LINE_ALIGNMENT_VERT)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_From_int((int)LINE_ALIGNMENT_TO_NEXT_HANDLE)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_From_int((int)LINE_ALIGNMENT_NONE)); + PyDict_SetItemString(d,"SHADOW_NONE", SWIG_From_int((int)SHADOW_NONE)); + PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_From_int((int)SHADOW_LEFT)); + PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_From_int((int)SHADOW_RIGHT)); + PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_From_int((int)OP_CLICK_LEFT)); + PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_From_int((int)OP_CLICK_RIGHT)); + PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_From_int((int)OP_DRAG_LEFT)); + PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_From_int((int)OP_DRAG_RIGHT)); + PyDict_SetItemString(d,"OP_ALL", SWIG_From_int((int)OP_ALL)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_From_int((int)ATTACHMENT_MODE_NONE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_From_int((int)ATTACHMENT_MODE_EDGE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_From_int((int)ATTACHMENT_MODE_BRANCHING)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_From_int((int)BRANCHING_ATTACHMENT_NORMAL)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_From_int((int)BRANCHING_ATTACHMENT_BLOB)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_From_int((int)gyCONSTRAINT_CENTRED_VERTICALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_From_int((int)gyCONSTRAINT_CENTRED_HORIZONTALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_From_int((int)gyCONSTRAINT_CENTRED_BOTH)); + PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_From_int((int)gyCONSTRAINT_LEFT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_From_int((int)gyCONSTRAINT_RIGHT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_From_int((int)gyCONSTRAINT_ABOVE)); + PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_From_int((int)gyCONSTRAINT_BELOW)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_From_int((int)gyCONSTRAINT_ALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_From_int((int)gyCONSTRAINT_ALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_From_int((int)gyCONSTRAINT_ALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_From_int((int)gyCONSTRAINT_ALIGNED_RIGHT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_From_int((int)gyCONSTRAINT_MIDALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_From_int((int)gyCONSTRAINT_MIDALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_From_int((int)gyCONSTRAINT_MIDALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_From_int((int)gyCONSTRAINT_MIDALIGNED_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_From_int((int)DIVISION_SIDE_NONE)); + PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_From_int((int)DIVISION_SIDE_LEFT)); + PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_From_int((int)DIVISION_SIDE_TOP)); + PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_From_int((int)DIVISION_SIDE_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_From_int((int)DIVISION_SIDE_BOTTOM)); // initoglbasicc();