X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8edf1c75f0667d3568e224910fa858cf05234942..b1f29bf76f19e1a0adbd7ba108f275469dad445e:/wxPython/contrib/ogl/msw/ogl_wrap.cpp?ds=sidebyside diff --git a/wxPython/contrib/ogl/msw/ogl_wrap.cpp b/wxPython/contrib/ogl/msw/ogl_wrap.cpp index c78e9eaf7a..aaffa6f8da 100644 --- a/wxPython/contrib/ogl/msw/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/msw/ogl_wrap.cpp @@ -123,7 +123,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); } #endif - /*********************************************************************** * pyrun.swg for wxPython * @@ -195,28 +194,6 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -/* ----------------------------------------------------------------------------- - * the needed conversions between C++ and python - * ----------------------------------------------------------------------------- */ -/* basic types */ -/* - utilities -*/ -SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); -SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); -SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); -SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, - long min_value, long max_value); -SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, - unsigned long max_value); -SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); -SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, - char** cptr, size_t* size); -SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, - char* carray, size_t size); -SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); -SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); - /* Contract support */ @@ -227,7 +204,6 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #endif - /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_wxOGLConstraint swig_types[0] @@ -247,32 +223,31 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxScrolledWindow swig_types[14] #define SWIGTYPE_p_wxWindow swig_types[15] #define SWIGTYPE_p_double swig_types[16] -#define SWIGTYPE_p_wxPyDrawnShape swig_types[17] -#define SWIGTYPE_p_wxPyDivisionShape swig_types[18] +#define SWIGTYPE_p_wxPyDivisionShape swig_types[17] +#define SWIGTYPE_p_wxPyDrawnShape swig_types[18] #define SWIGTYPE_p_wxPyPolygonShape swig_types[19] #define SWIGTYPE_p_wxBitmap swig_types[20] #define SWIGTYPE_p_wxObject swig_types[21] #define SWIGTYPE_p_wxPyBitmapShape swig_types[22] -#define SWIGTYPE_p_wxString swig_types[23] -#define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[24] -#define SWIGTYPE_p_wxEvtHandler swig_types[25] -#define SWIGTYPE_p_wxPyEllipseShape swig_types[26] -#define SWIGTYPE_p_wxPyShapeCanvas swig_types[27] -#define SWIGTYPE_p_wxPoint swig_types[28] -#define SWIGTYPE_p_wxDiagram swig_types[29] -#define SWIGTYPE_p_wxPyShape swig_types[30] -#define SWIGTYPE_p_wxAttachmentPoint swig_types[31] -#define SWIGTYPE_p_wxClassInfo swig_types[32] -#define SWIGTYPE_p_wxPyLineShape swig_types[33] -#define SWIGTYPE_p_wxPyRectangleShape swig_types[34] -#define SWIGTYPE_p_wxPyCompositeShape swig_types[35] -#define SWIGTYPE_p_wxPyCircleShape swig_types[36] -#define SWIGTYPE_p_wxPen swig_types[37] -#define SWIGTYPE_p_int swig_types[38] -#define SWIGTYPE_p_wxPseudoMetaFile swig_types[39] -#define SWIGTYPE_p_wxPyTextShape swig_types[40] -#define SWIGTYPE_p_wxPyDividedShape swig_types[41] -static swig_type_info *swig_types[43]; +#define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[23] +#define SWIGTYPE_p_wxEvtHandler swig_types[24] +#define SWIGTYPE_p_wxPyEllipseShape swig_types[25] +#define SWIGTYPE_p_wxPyShapeCanvas swig_types[26] +#define SWIGTYPE_p_wxPoint swig_types[27] +#define SWIGTYPE_p_wxDiagram swig_types[28] +#define SWIGTYPE_p_wxPyShape swig_types[29] +#define SWIGTYPE_p_wxAttachmentPoint swig_types[30] +#define SWIGTYPE_p_wxClassInfo swig_types[31] +#define SWIGTYPE_p_wxPyLineShape swig_types[32] +#define SWIGTYPE_p_wxPyRectangleShape swig_types[33] +#define SWIGTYPE_p_wxPyCompositeShape swig_types[34] +#define SWIGTYPE_p_wxPyCircleShape swig_types[35] +#define SWIGTYPE_p_wxPen swig_types[36] +#define SWIGTYPE_p_int swig_types[37] +#define SWIGTYPE_p_wxPseudoMetaFile swig_types[38] +#define SWIGTYPE_p_wxPyTextShape swig_types[39] +#define SWIGTYPE_p_wxPyDividedShape swig_types[40] +static swig_type_info *swig_types[42]; /* -------- TYPES TABLE (END) -------- */ @@ -284,42 +259,47 @@ static swig_type_info *swig_types[43]; #define SWIG_name "_ogl" -#include -#include -#include +/* Auxiliar swig macros */ -#ifndef SWIGSTATIC #ifdef __cplusplus -#define SWIGSTATIC(a) static inline a -#else +#define SWIGSTATICINLINE(a) static inline a #define SWIGSTATIC(a) static a -#endif -#endif +#define swig_new_array(type, size) (new type[(size)]) +#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) -#ifndef numeric_cast -#ifdef __cplusplus #ifdef HAVE_NUMERIC_CAST -#define numeric_cast(type,a) numeric_cast(a) -#else -#define numeric_cast(type,a) static_cast(a) -#endif +#define swig_numeric_cast(type,a) numeric_cast(a) #else -#define numeric_cast(type,a) (type)(a) -#endif +#define swig_numeric_cast(type,a) static_cast(a) #endif +#else /* C case */ + +#define SWIGSTATICINLINE(a) static a +#define SWIGSTATIC(a) static a +#define swig_new_array(type, size) ((type*) malloc((size)*sizeof(type))) +#define swig_delete_array(cptr) free((char*)cptr) +#define swig_const_cast(type,a) (type)(a) +#define swig_static_cast(type,a) (type)(a) +#define swig_reinterpret_cast(type,a) (type)(a) +#define swig_numeric_cast(type,a) (type)(a) + +#endif /* __cplusplus */ -#define SWIG_PyObj_FromSignedChar PyInt_FromLong -#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong -#define SWIG_PyObj_FromShort PyInt_FromLong -#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong -#define SWIG_PyObj_FromInt PyInt_FromLong -#define SWIG_PyObj_FromLong PyInt_FromLong -#define SWIG_PyObj_FromFloat PyFloat_FromDouble -#define SWIG_PyObj_FromDouble PyFloat_FromDouble -#define SWIG_PyObj_FromFloat PyFloat_FromDouble -#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_FromSignedChar PyInt_FromLong +#define SWIG_FromUnsignedChar PyInt_FromLong +#define SWIG_FromShort PyInt_FromLong +#define SWIG_FromUnsignedShort PyInt_FromLong +#define SWIG_FromInt PyInt_FromLong +#define SWIG_FromLong PyInt_FromLong +#define SWIG_FromFloat PyFloat_FromDouble +#define SWIG_FromDouble PyFloat_FromDouble +#define SWIG_FromFloat PyFloat_FromDouble +#define SWIG_FromDouble PyFloat_FromDouble #include "wx/wxPython/wxPython.h" @@ -329,27 +309,99 @@ static swig_type_info *swig_types[43]; static const wxString wxPyEmptyString(wxEmptyString); -SWIGSTATIC(double) -SWIG_PyObj_AsDouble(PyObject *obj) +SWIGSTATICINLINE(double) +SWIG_AsDouble(PyObject *obj) { - return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : -#if HAVE_LONG_LONG - (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); -#else - (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); -#endif + if (PyNumber_Check(obj)) + return PyFloat_AsDouble(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } +} + + +SWIGSTATICINLINE(int) +SWIG_CheckDouble(PyObject* obj) +{ + SWIG_AsDouble(obj); if (PyErr_Occurred()) { PyErr_Clear(); - PyErr_SetString(PyExc_TypeError, "a double is expected"); + return 0; + } else { + return 1; + } +} + + +#include + + +SWIGSTATICINLINE(long) +SWIG_CheckLongInRange(long value, const char* type, + long min_value, long max_value) +{ + if (!PyErr_Occurred()) { + if (value < min_value) { + PyObject *err = + PyString_FromFormat("value %ld is less than '%s' minimum %ld", + value, type, min_value); + + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } else if (value > max_value) { + PyObject *err = + PyString_FromFormat("value %ld is greater than '%s' maximum %ld", + value, type, max_value); + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } } + return value; } -SWIGSTATIC(int) -SWIG_PyObj_AsInt(PyObject *obj) +SWIGSTATICINLINE(long) +SWIG_AsLong(PyObject * obj) +{ + if (PyNumber_Check(obj)) + return PyInt_AsLong(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } +} + + +#if INT_MAX != LONG_MAX +SWIGSTATICINLINE(int) +SWIG_AsInt(PyObject *obj) { - return numeric_cast(int, - SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); + return swig_numeric_cast(int, + SWIG_CheckLongInRange(SWIG_AsLong(obj), + "int", INT_MIN, INT_MAX)); +} +#else +#define SWIG_AsInt SWIG_AsLong +#endif + + +SWIGSTATICINLINE(int) +SWIG_CheckInt(PyObject* obj) +{ + SWIG_AsInt(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } } @@ -386,19 +438,23 @@ void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } -SWIGSTATIC(bool) -SWIG_PyObj_AsBool(PyObject *obj) +SWIGSTATICINLINE(bool) +SWIG_AsBool(PyObject *obj) { return PyObject_IsTrue(obj) ? true : false; } -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) +SWIGSTATICINLINE(int) +SWIG_CheckBool(PyObject* obj) { - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; + SWIG_AsBool(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } } @@ -413,10 +469,16 @@ PyObject *wxPyShape_GetLines(wxPyShape *self){ return wxPy_ConvertShapeList(&list); } -SWIGSTATIC(long) -SWIG_PyObj_AsLong(PyObject * obj) +SWIGSTATICINLINE(int) +SWIG_CheckLong(PyObject* obj) { - return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); + SWIG_AsLong(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } } PyObject *wxPyShape_GetRegions(wxPyShape *self){ @@ -522,7 +584,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); @@ -538,21 +618,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(); @@ -561,7 +627,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(); @@ -569,7 +635,7 @@ PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){ PyList_Append(pyList, pyObj); node = node->GetNext(); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return pyList; } @@ -600,17 +666,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; } @@ -698,6 +764,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; @@ -705,7 +792,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { wxObject* wxObj; wxNode* node = list->GetFirst(); - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { wxObj = node->GetData(); @@ -713,7 +800,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { PyList_Append(pyList, pyObj); node = node->GetNext(); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return pyList; } @@ -761,7 +848,7 @@ static PyObject *_wrap_new_ShapeRegion(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxShapeRegion, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxShapeRegion, 1); return resultobj; fail: return NULL; @@ -780,7 +867,8 @@ static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetText",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -819,7 +907,8 @@ static PyObject *_wrap_ShapeRegion_SetFont(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxFont* temp; if (obj1) { @@ -869,15 +958,12 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinSize(arg2,arg3); @@ -905,15 +991,12 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -941,15 +1024,12 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2,arg3); @@ -977,15 +1057,12 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetProportions",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetProportions(arg2,arg3); @@ -1011,11 +1088,10 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFormatMode",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFormatMode(arg2); @@ -1042,7 +1118,8 @@ static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -1082,7 +1159,8 @@ static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -1120,7 +1198,8 @@ static PyObject *_wrap_ShapeRegion_GetText(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetText",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetText(); @@ -1151,7 +1230,8 @@ static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFont",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFont *)(arg1)->GetFont(); @@ -1159,7 +1239,7 @@ static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0); return resultobj; fail: return NULL; @@ -1181,7 +1261,8 @@ static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *self, PyObject *args, Py arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetMinSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetMinSize(arg2,arg3); @@ -1219,7 +1300,8 @@ static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *self, PyObject *args, arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetProportion",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetProportion(arg2,arg3); @@ -1257,7 +1339,8 @@ static PyObject *_wrap_ShapeRegion_GetSize(PyObject *self, PyObject *args, PyObj arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetSize(arg2,arg3); @@ -1295,7 +1378,8 @@ static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *self, PyObject *args, P arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetPosition(arg2,arg3); @@ -1328,7 +1412,8 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFormatMode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetFormatMode(); @@ -1336,7 +1421,7 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1353,7 +1438,8 @@ static PyObject *_wrap_ShapeRegion_GetName(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetName",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetName(); @@ -1384,7 +1470,8 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetColour",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetColour(); @@ -1415,7 +1502,8 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetActualColourObject",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetActualColourObject(); @@ -1426,7 +1514,7 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec { wxColour * resultptr; resultptr = new wxColour((wxColour &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxColour, 1); } return resultobj; fail: @@ -1444,7 +1532,8 @@ static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetFormattedText",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -1455,7 +1544,7 @@ static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxList, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxList, 0); return resultobj; fail: return NULL; @@ -1472,7 +1561,8 @@ static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPenColour",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPenColour(); @@ -1503,7 +1593,8 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPenStyle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetPenStyle(); @@ -1511,7 +1602,7 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1529,11 +1620,10 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenStyle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPenStyle(arg2); @@ -1560,7 +1650,8 @@ static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -1598,7 +1689,8 @@ static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetActualPen",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPen *)(arg1)->GetActualPen(); @@ -1606,7 +1698,7 @@ static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0); return resultobj; fail: return NULL; @@ -1623,7 +1715,8 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetWidth(); @@ -1631,7 +1724,7 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1648,7 +1741,8 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetHeight(); @@ -1656,7 +1750,7 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1672,7 +1766,8 @@ static PyObject *_wrap_ShapeRegion_ClearText(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_ClearText",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearText(); @@ -1709,22 +1804,16 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AttachmentPoint",kwnames,&obj0,&obj1,&obj2)) goto fail; if (obj0) { - { - arg1 = (int) SWIG_PyObj_AsInt(obj0); - if (PyErr_Occurred()) SWIG_fail; - } + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1733,7 +1822,7 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAttachmentPoint, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxAttachmentPoint, 1); return resultobj; fail: return NULL; @@ -1751,11 +1840,10 @@ static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_id_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_id = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1775,10 +1863,11 @@ static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_id_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (int) ((arg1)->m_id); - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1796,11 +1885,10 @@ static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_x_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1820,10 +1908,11 @@ static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (double) ((arg1)->m_x); - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1841,11 +1930,10 @@ static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_y_set",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1865,10 +1953,11 @@ static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AttachmentPoint_m_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; result = (double) ((arg1)->m_y); - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1895,10 +1984,12 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyShapeEvtHandler",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1929,7 +2020,8 @@ static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -1957,7 +2049,8 @@ static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler__setOORInfo",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1984,8 +2077,10 @@ static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_SetShape",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetShape(arg2); @@ -2010,7 +2105,8 @@ static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_GetShape",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->GetShape(); @@ -2038,8 +2134,10 @@ static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_SetPreviousHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPreviousHandler(arg2); @@ -2064,7 +2162,8 @@ static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_GetPreviousHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShapeEvtHandler *)(arg1)->GetPreviousHandler(); @@ -2091,7 +2190,8 @@ static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_CreateNewCopy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShapeEvtHandler *)(arg1)->CreateNewCopy(); @@ -2117,7 +2217,8 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeEvtHandler_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -2143,10 +2244,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2173,10 +2278,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2205,16 +2314,18 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeEvtHandler_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2241,10 +2352,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2271,10 +2386,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2301,10 +2420,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2331,10 +2454,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2367,26 +2494,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2419,26 +2539,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2471,26 +2584,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2519,15 +2625,12 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -2564,32 +2667,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShapeEvtHandler_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2598,7 +2695,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -2626,32 +2725,26 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShapeEvtHandler_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2686,30 +2779,21 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2742,26 +2826,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2794,26 +2871,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2848,31 +2918,22 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); if (PyErr_Occurred()) SWIG_fail; } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - } - if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -2904,26 +2965,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2956,26 +3010,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3010,27 +3057,23 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShapeEvtHandler_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -3056,10 +3099,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *self }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3086,10 +3133,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *sel }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeEvtHandler_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3118,16 +3169,18 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeEvtHandler_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3164,31 +3217,23 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyShapeEvtHandler_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3223,27 +3268,21 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *se }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3278,27 +3317,21 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3327,15 +3360,12 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -3363,15 +3393,12 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -3404,7 +3431,8 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyShape",kwnames,&obj0)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3435,7 +3463,8 @@ static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -3467,7 +3496,8 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *self, PyObject *args, arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMax",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetBoundingBoxMax(arg2,arg3); @@ -3505,7 +3535,8 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *self, PyObject *args, arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMin",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetBoundingBoxMin(arg2,arg3); @@ -3552,23 +3583,16 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, arg6 = &temp6; arg7 = &temp7; 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_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetPerimeterPoint(arg2,arg3,arg4,arg5,arg6,arg7); @@ -3576,7 +3600,9 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyFloat_FromDouble((double) (*arg6)); resultobj = t_output_helper(resultobj,o); @@ -3601,7 +3627,8 @@ static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetCanvas",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShapeCanvas *)(arg1)->GetCanvas(); @@ -3629,8 +3656,10 @@ static PyObject *_wrap_PyShape_SetCanvas(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCanvas",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCanvas(arg2); @@ -3658,10 +3687,13 @@ static PyObject *_wrap_PyShape_AddToCanvas(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_AddToCanvas",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3688,8 +3720,10 @@ static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_InsertInCanvas",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->InsertInCanvas(arg2); @@ -3715,8 +3749,10 @@ static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_RemoveFromCanvas",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveFromCanvas(arg2); @@ -3741,7 +3777,8 @@ static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetX",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetX(); @@ -3749,7 +3786,7 @@ static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -3766,7 +3803,8 @@ static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetY",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetY(); @@ -3774,7 +3812,7 @@ static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -3792,11 +3830,10 @@ static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetX",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetX(arg2); @@ -3822,11 +3859,10 @@ static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetY",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetY(arg2); @@ -3851,7 +3887,8 @@ static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetParent",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->GetParent(); @@ -3879,8 +3916,10 @@ static PyObject *_wrap_PyShape_SetParent(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetParent",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetParent(arg2); @@ -3905,7 +3944,8 @@ static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetTopAncestor",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->GetTopAncestor(); @@ -3932,7 +3972,8 @@ static PyObject *_wrap_PyShape_GetChildren(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetChildren",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyShape_GetChildren(arg1); @@ -3956,7 +3997,8 @@ static PyObject *_wrap_PyShape_Unlink(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Unlink",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Unlink(); @@ -3982,11 +4024,10 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDrawHandles",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDrawHandles(arg2); @@ -4011,7 +4052,8 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetDrawHandles",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetDrawHandles(); @@ -4019,7 +4061,9 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4035,7 +4079,8 @@ static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_MakeControlPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeControlPoints(); @@ -4061,9 +4106,11 @@ static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_DeleteControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4088,7 +4135,8 @@ static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ResetControlPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ResetControlPoints(); @@ -4113,7 +4161,8 @@ static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetEventHandler",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShapeEvtHandler *)(arg1)->GetEventHandler(); @@ -4141,8 +4190,10 @@ static PyObject *_wrap_PyShape_SetEventHandler(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetEventHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEventHandler(arg2); @@ -4166,7 +4217,8 @@ static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_MakeMandatoryControlPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeMandatoryControlPoints(); @@ -4190,7 +4242,8 @@ static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ResetMandatoryControlPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ResetMandatoryControlPoints(); @@ -4215,7 +4268,8 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Recompute",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Recompute(); @@ -4223,7 +4277,9 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4239,7 +4295,8 @@ static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_CalculateSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CalculateSize(); @@ -4267,15 +4324,15 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_Select",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4304,18 +4361,15 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_SetHighlight",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4341,7 +4395,8 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_IsHighlighted",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsHighlighted(); @@ -4349,7 +4404,9 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4366,7 +4423,8 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Selected",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Selected(); @@ -4374,7 +4432,9 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4391,7 +4451,8 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_AncestorSelected",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AncestorSelected(); @@ -4399,7 +4460,9 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4419,18 +4482,15 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_SetSensitivityFilter",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4456,7 +4516,8 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetSensitivityFilter",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetSensitivityFilter(); @@ -4464,7 +4525,7 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -4484,16 +4545,13 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4522,15 +4580,12 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFixedSize(arg2,arg3); @@ -4560,7 +4615,8 @@ static PyObject *_wrap_PyShape_GetFixedSize(PyObject *self, PyObject *args, PyOb arg2 = &temp2; arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetFixedSize(arg2,arg3); @@ -4593,7 +4649,8 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetFixedWidth(); @@ -4601,7 +4658,9 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4618,7 +4677,8 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetFixedHeight(); @@ -4626,7 +4686,9 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4644,11 +4706,10 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetSpaceAttachments",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpaceAttachments(arg2); @@ -4673,7 +4734,8 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetSpaceAttachments",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetSpaceAttachments(); @@ -4681,7 +4743,9 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4701,16 +4765,13 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetShadowMode",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4736,7 +4797,8 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetShadowMode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetShadowMode(); @@ -4744,7 +4806,7 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -4771,15 +4833,12 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject arg4 = &temp4; arg5 = &temp5; 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_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->HitTest(arg2,arg3,arg4,arg5); @@ -4787,7 +4846,9 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyInt_FromLong((long) (*arg4)); resultobj = t_output_helper(resultobj,o); @@ -4813,11 +4874,10 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCentreResize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCentreResize(arg2); @@ -4842,7 +4902,8 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetCentreResize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetCentreResize(); @@ -4850,7 +4911,9 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4868,11 +4931,10 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetMaintainAspectRatio",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaintainAspectRatio(arg2); @@ -4897,7 +4959,8 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetMaintainAspectRatio",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetMaintainAspectRatio(); @@ -4905,7 +4968,9 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4922,7 +4987,8 @@ static PyObject *_wrap_PyShape_GetLines(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetLines",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyShape_GetLines(arg1); @@ -4948,11 +5014,10 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDisableLabel",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDisableLabel(arg2); @@ -4977,7 +5042,8 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetDisableLabel",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetDisableLabel(); @@ -4985,7 +5051,9 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5003,11 +5071,10 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetAttachmentMode",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentMode(arg2); @@ -5032,7 +5099,8 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetAttachmentMode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAttachmentMode(); @@ -5040,7 +5108,7 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -5058,11 +5126,10 @@ static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetId",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (long) SWIG_PyObj_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -5087,7 +5154,8 @@ static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetId",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->GetId(); @@ -5095,7 +5163,7 @@ static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -5113,7 +5181,8 @@ static PyObject *_wrap_PyShape_SetPen(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetPen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxPen* temp; if (obj1) { @@ -5157,7 +5226,8 @@ static PyObject *_wrap_PyShape_SetBrush(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBrush",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxBrush* temp; if (obj1) { @@ -5199,11 +5269,10 @@ static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Show",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Show(arg2); @@ -5228,7 +5297,8 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_IsShown",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsShown(); @@ -5236,7 +5306,9 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5260,24 +5332,22 @@ static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShape_Move",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (bool) SWIG_PyObj_AsBool(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (bool) SWIG_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5304,10 +5374,14 @@ static PyObject *_wrap_PyShape_Erase(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Erase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5334,10 +5408,14 @@ static PyObject *_wrap_PyShape_EraseContents(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_EraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5364,10 +5442,14 @@ static PyObject *_wrap_PyShape_Draw(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Draw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5392,7 +5474,8 @@ static PyObject *_wrap_PyShape_Flash(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Flash",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Flash(); @@ -5418,10 +5501,14 @@ static PyObject *_wrap_PyShape_MoveLinks(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_MoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5448,10 +5535,14 @@ static PyObject *_wrap_PyShape_DrawContents(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_DrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5482,20 +5573,15 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_SetSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (bool) SWIG_PyObj_AsBool(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (bool) SWIG_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5524,15 +5610,12 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetAttachmentSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentSize(arg2,arg3); @@ -5558,8 +5641,10 @@ static PyObject *_wrap_PyShape_Attach(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Attach",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Attach(arg2); @@ -5583,7 +5668,8 @@ static PyObject *_wrap_PyShape_Detach(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Detach",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Detach(); @@ -5608,7 +5694,8 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Constrain",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Constrain(); @@ -5616,7 +5703,9 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5644,32 +5733,27 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:PyShape_AddLine",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5697,8 +5781,10 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetLinePosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetLinePosition(arg2); @@ -5706,7 +5792,7 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -5725,7 +5811,8 @@ static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AddText",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -5763,7 +5850,8 @@ static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetPen",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPen *)(arg1)->GetPen(); @@ -5771,7 +5859,7 @@ static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0); return resultobj; fail: return NULL; @@ -5788,7 +5876,8 @@ static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBrush",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBrush *)(arg1)->GetBrush(); @@ -5796,7 +5885,7 @@ static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0); return resultobj; fail: return NULL; @@ -5812,7 +5901,8 @@ static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_SetDefaultRegionSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDefaultRegionSize(); @@ -5843,10 +5933,14 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_FormatText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { arg3 = wxString_in_helper(obj2); @@ -5854,10 +5948,8 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje temp3 = True; } if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5894,16 +5986,13 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFormatMode",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5931,12 +6020,11 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetFormatMode",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5945,7 +6033,7 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -5965,7 +6053,8 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFont",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxFont* temp; if (obj1) { @@ -5989,10 +6078,8 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject arg2 = NULL; } if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6020,12 +6107,11 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6034,7 +6120,7 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0); return resultobj; fail: return NULL; @@ -6055,17 +6141,16 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6101,12 +6186,11 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetTextColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6138,7 +6222,8 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetNumberOfTextRegions",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetNumberOfTextRegions(); @@ -6146,7 +6231,7 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6167,17 +6252,16 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetRegionName",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6213,11 +6297,10 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetRegionName(arg2); @@ -6251,7 +6334,8 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionId",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -6264,7 +6348,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); { if (temp2) delete arg2; @@ -6292,7 +6376,8 @@ static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_NameRegions",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { { arg2 = wxString_in_helper(obj1); @@ -6332,7 +6417,8 @@ static PyObject *_wrap_PyShape_GetRegions(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetRegions",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyShape_GetRegions(arg1); @@ -6358,8 +6444,10 @@ static PyObject *_wrap_PyShape_AddRegion(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AddRegion",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddRegion(arg2); @@ -6383,7 +6471,8 @@ static PyObject *_wrap_PyShape_ClearRegions(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ClearRegions",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearRegions(); @@ -6407,7 +6496,8 @@ static PyObject *_wrap_PyShape_AssignNewIds(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_AssignNewIds",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignNewIds(); @@ -6438,7 +6528,8 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje arg3 = &temp3; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegion",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -6483,10 +6574,14 @@ static PyObject *_wrap_PyShape_FindRegionNames(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegionNames",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxStringList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxStringList, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6513,12 +6608,11 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_ClearText",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6545,8 +6639,10 @@ static PyObject *_wrap_PyShape_RemoveLine(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_RemoveLine",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveLine(arg2); @@ -6585,25 +6681,21 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a arg3 = &temp3; arg4 = &temp4; 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_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **)(&arg7),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6612,7 +6704,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6637,7 +6731,8 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetNumberOfAttachments",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetNumberOfAttachments(); @@ -6645,7 +6740,7 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6664,11 +6759,10 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AttachmentIsValid",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AttachmentIsValid(arg2); @@ -6676,7 +6770,9 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6693,7 +6789,8 @@ static PyObject *_wrap_PyShape_GetAttachments(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetAttachments",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyShape_GetAttachments(arg1); @@ -6732,25 +6829,21 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec arg3 = &temp3; arg4 = &temp4; 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_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **)(&arg7),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6759,7 +6852,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6796,7 +6891,8 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_CalcSimpleAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail; @@ -6805,15 +6901,12 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; } - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcSimpleAttachment((wxRealPoint const &)*arg2,(wxRealPoint const &)*arg3,arg4,arg5,arg6); @@ -6824,7 +6917,7 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar { wxRealPoint * resultptr; resultptr = new wxRealPoint((wxRealPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRealPoint, 1); } return resultobj; fail: @@ -6850,11 +6943,10 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_AttachmentSortTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; @@ -6870,7 +6962,9 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6892,22 +6986,22 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_EraseLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - { - arg4 = (bool) SWIG_PyObj_AsBool(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (bool) SWIG_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6938,22 +7032,22 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_DrawLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - { - arg4 = (bool) SWIG_PyObj_AsBool(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (bool) SWIG_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6987,20 +7081,21 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_MoveLineToNewAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->MoveLineToNewAttachment(*arg2,arg3,arg4,arg5); @@ -7008,7 +7103,9 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7026,7 +7123,8 @@ static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_ApplyAttachmentOrdering",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7054,11 +7152,10 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBranchingAttachmentRoot(arg2); @@ -7069,7 +7166,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje { wxRealPoint * resultptr; resultptr = new wxRealPoint((wxRealPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxRealPoint, 1); } return resultobj; fail: @@ -7101,11 +7198,10 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; @@ -7129,7 +7225,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7156,15 +7254,12 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { arg4 = &temp4; if ( ! wxRealPoint_helper(obj3, &arg4)) SWIG_fail; @@ -7180,7 +7275,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7199,11 +7296,10 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetAttachmentLineCount",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAttachmentLineCount(arg2); @@ -7211,7 +7307,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -7229,11 +7325,10 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchNeckLength",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchNeckLength(arg2); @@ -7258,7 +7353,8 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchNeckLength",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetBranchNeckLength(); @@ -7266,7 +7362,7 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -7284,11 +7380,10 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStemLength",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchStemLength(arg2); @@ -7313,7 +7408,8 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchStemLength",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetBranchStemLength(); @@ -7321,7 +7417,7 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -7339,11 +7435,10 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchSpacing",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchSpacing(arg2); @@ -7368,7 +7463,8 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchSpacing",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetBranchSpacing(); @@ -7376,7 +7472,7 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -7394,11 +7490,10 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStyle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (long) SWIG_PyObj_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchStyle(arg2); @@ -7423,7 +7518,8 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBranchStyle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->GetBranchStyle(); @@ -7431,7 +7527,7 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -7450,11 +7546,10 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->PhysicalToLogicalAttachment(arg2); @@ -7462,7 +7557,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -7481,11 +7576,10 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->LogicalToPhysicalAttachment(arg2); @@ -7493,7 +7587,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -7510,7 +7604,8 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_Draggable",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Draggable(); @@ -7518,7 +7613,9 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7537,8 +7634,10 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_HasDescendant",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->HasDescendant(arg2); @@ -7546,7 +7645,9 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7567,18 +7668,15 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_CreateNewCopy",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7607,10 +7705,14 @@ static PyObject *_wrap_PyShape_Copy(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Copy",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7637,10 +7739,14 @@ static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_CopyWithHandler",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7671,19 +7777,14 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -7708,7 +7809,8 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetRotation",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetRotation(); @@ -7716,7 +7818,7 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -7734,11 +7836,10 @@ static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetRotation",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRotation(arg2); @@ -7762,7 +7863,8 @@ static PyObject *_wrap_PyShape_ClearAttachments(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_ClearAttachments",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearAttachments(); @@ -7788,10 +7890,14 @@ static PyObject *_wrap_PyShape_Recentre(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Recentre",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7818,10 +7924,14 @@ static PyObject *_wrap_PyShape_ClearPointList(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_ClearPointList",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxList, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7847,7 +7957,8 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBackgroundPen",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBackgroundPen(); @@ -7858,7 +7969,7 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args, { wxPen * resultptr; resultptr = new wxPen((wxPen &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPen, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPen, 1); } return resultobj; fail: @@ -7876,7 +7987,8 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBackgroundBrush",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBackgroundBrush(); @@ -7887,7 +7999,7 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args { wxBrush * resultptr; resultptr = new wxBrush((wxBrush &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxBrush, 1); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxBrush, 1); } return resultobj; fail: @@ -7904,7 +8016,8 @@ static PyObject *_wrap_PyShape_base_OnDelete(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -7930,10 +8043,14 @@ static PyObject *_wrap_PyShape_base_OnDraw(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7960,10 +8077,14 @@ static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7992,16 +8113,18 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8028,10 +8151,14 @@ static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8058,10 +8185,14 @@ static PyObject *_wrap_PyShape_base_OnErase(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8088,10 +8219,14 @@ static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8118,10 +8253,14 @@ static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8154,26 +8293,19 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8206,26 +8338,19 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8258,26 +8383,19 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8306,15 +8424,12 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -8351,32 +8466,26 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8385,7 +8494,9 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8413,32 +8524,26 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8473,30 +8578,21 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8529,26 +8625,19 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8581,32 +8670,25 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - } - if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; @@ -8635,30 +8717,21 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8691,26 +8764,19 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8743,26 +8809,19 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8797,27 +8856,23 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -8843,10 +8898,14 @@ static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8873,10 +8932,14 @@ static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8905,16 +8968,18 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8951,31 +9016,23 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9010,27 +9067,21 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9065,27 +9116,21 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9114,15 +9159,12 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -9150,15 +9192,12 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -9213,7 +9252,8 @@ static PyObject *_wrap_delete_PseudoMetaFile(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PseudoMetaFile",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -9243,19 +9283,19 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Draw",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Draw(*arg2,arg3,arg4); @@ -9279,7 +9319,8 @@ static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_Clear",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Clear(); @@ -9305,10 +9346,14 @@ static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_Copy",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9337,15 +9382,12 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scale(arg2,arg3); @@ -9373,15 +9415,12 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_ScaleTo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ScaleTo(arg2,arg3); @@ -9409,15 +9448,12 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Translate(arg2,arg3); @@ -9447,19 +9483,14 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -9491,14 +9522,17 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_LoadFromMetaFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_double, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFromMetaFile((wxString const &)*arg2,arg3,arg4); @@ -9506,7 +9540,9 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -9538,11 +9574,16 @@ static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PseudoMetaFile_GetBounds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_double, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_double, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_double, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetBounds(arg2,arg3,arg4,arg5); @@ -9568,8 +9609,10 @@ static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_CalculateSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CalculateSize(arg2); @@ -9595,11 +9638,10 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetRotateable",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRotateable(arg2); @@ -9624,7 +9666,8 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetRotateable",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetRotateable(); @@ -9632,7 +9675,9 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9652,15 +9697,12 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -9686,7 +9728,8 @@ static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetFillBrush",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxBrush* temp; if (obj1) { @@ -9727,7 +9770,8 @@ static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetFillBrush",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBrush *)(arg1)->GetFillBrush(); @@ -9735,7 +9779,7 @@ static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0); return resultobj; fail: return NULL; @@ -9753,7 +9797,8 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlinePen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxPen* temp; if (obj1) { @@ -9796,7 +9841,8 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetOutlinePen",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPen *)(arg1)->GetOutlinePen(); @@ -9804,7 +9850,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0); return resultobj; fail: return NULL; @@ -9822,11 +9868,10 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOutlineOp(arg2); @@ -9851,7 +9896,8 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_GetOutlineOp",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetOutlineOp(); @@ -9859,7 +9905,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -9876,7 +9922,8 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_IsValid",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsValid(); @@ -9884,7 +9931,9 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9906,7 +9955,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -9941,7 +9991,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawRectangle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -9974,15 +10025,14 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -10015,7 +10065,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -10058,19 +10109,16 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4); @@ -10097,7 +10145,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawEllipse",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -10128,7 +10177,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawPoint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -10162,7 +10212,8 @@ static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -10207,12 +10258,12 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3); @@ -10242,17 +10293,15 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(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_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10281,12 +10330,12 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSpline(arg2,arg3); @@ -10313,7 +10362,8 @@ static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetClippingRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -10341,7 +10391,8 @@ static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PseudoMetaFile_DestroyClippingRect",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DestroyClippingRect(); @@ -10369,7 +10420,8 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_SetPen",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxPen* temp; if (obj1) { @@ -10389,10 +10441,8 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO arg2 = NULL; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10421,7 +10471,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_SetBrush",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxBrush* temp; if (obj1) { @@ -10439,10 +10490,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P arg2 = NULL; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10469,7 +10518,8 @@ static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxFont* temp; if (obj1) { @@ -10518,7 +10568,8 @@ static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetTextColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; @@ -10549,7 +10600,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; @@ -10579,11 +10631,10 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBackgroundMode(arg2); @@ -10618,16 +10669,12 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyRectangleShape",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - { - arg1 = (double) SWIG_PyObj_AsDouble(obj0); - if (PyErr_Occurred()) SWIG_fail; - } + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10636,7 +10683,7 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyRectangleShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyRectangleShape, 1); return resultobj; fail: return NULL; @@ -10656,7 +10703,8 @@ static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -10684,11 +10732,10 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCornerRadius(arg2); @@ -10713,7 +10760,8 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyRectangleShape_GetCornerRadius",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetCornerRadius(); @@ -10721,7 +10769,7 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -10737,7 +10785,8 @@ static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyRectangleShape_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -10763,10 +10812,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10793,10 +10846,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10825,16 +10882,18 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyRectangleShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10861,10 +10920,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10891,10 +10954,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10921,10 +10988,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10951,10 +11022,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10987,26 +11062,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11039,26 +11107,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11091,26 +11152,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11139,15 +11193,12 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -11184,33 +11235,27 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyRectangleShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + if (obj6) { + arg7 = (bool) SWIG_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnMovePre(*arg2,arg3,arg4,arg5,arg6,arg7); @@ -11218,7 +11263,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11246,32 +11293,26 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyRectangleShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11306,30 +11347,21 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11362,26 +11394,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11414,26 +11439,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11468,30 +11486,21 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11524,26 +11533,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11576,26 +11578,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11630,27 +11625,23 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyRectangleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -11676,10 +11667,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11706,10 +11701,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *self }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11738,16 +11737,18 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyRectangleShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11784,31 +11785,23 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyRectangleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11843,27 +11836,21 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *sel }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11898,27 +11885,21 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11947,15 +11928,12 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -11983,15 +11961,12 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -12034,34 +12009,28 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_PyControlPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj2) { - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12070,7 +12039,7 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyControlPoint, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyControlPoint, 1); return resultobj; fail: return NULL; @@ -12090,7 +12059,8 @@ static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -12118,11 +12088,10 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCornerRadius(arg2); @@ -12146,7 +12115,8 @@ static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControlPoint_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -12172,10 +12142,14 @@ static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12202,10 +12176,14 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12234,16 +12212,18 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyControlPoint_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12270,10 +12250,14 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12300,10 +12284,14 @@ static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12330,10 +12318,14 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12360,10 +12352,14 @@ static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12396,26 +12392,19 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12448,26 +12437,19 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12500,26 +12482,19 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12548,15 +12523,12 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -12593,32 +12565,26 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyControlPoint_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12627,7 +12593,9 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -12655,33 +12623,27 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyControlPoint_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + if (obj6) { + arg7 = (bool) SWIG_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7); @@ -12715,30 +12677,21 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12771,26 +12724,19 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12823,26 +12769,19 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12877,30 +12816,21 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12933,26 +12863,19 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12985,26 +12908,19 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13039,27 +12955,23 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyControlPoint_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -13085,10 +12997,14 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13115,10 +13031,14 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13147,16 +13067,18 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyControlPoint_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13193,31 +13115,23 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyControlPoint_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13252,27 +13166,21 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13307,27 +13215,21 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13356,15 +13258,12 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -13392,15 +13291,12 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -13437,7 +13333,7 @@ static PyObject *_wrap_new_PyBitmapShape(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyBitmapShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyBitmapShape, 1); return resultobj; fail: return NULL; @@ -13457,7 +13353,8 @@ static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -13484,7 +13381,8 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_GetBitmap",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -13495,7 +13393,10 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBitmap, 0); + { + wxBitmap* resultptr = new wxBitmap(*result); + resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1); + } return resultobj; fail: return NULL; @@ -13512,7 +13413,8 @@ static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_GetFilename",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetFilename(); @@ -13544,10 +13446,14 @@ static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_SetBitmap",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13575,7 +13481,8 @@ static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_SetFilename",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -13612,7 +13519,8 @@ static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyBitmapShape_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -13638,10 +13546,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13668,10 +13580,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13700,16 +13616,18 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyBitmapShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13736,10 +13654,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13766,10 +13688,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13796,10 +13722,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13826,10 +13756,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13862,26 +13796,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13914,26 +13841,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13966,26 +13886,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14014,15 +13927,12 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -14059,32 +13969,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyBitmapShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14093,7 +13997,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14121,32 +14027,26 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyBitmapShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14181,30 +14081,21 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14237,26 +14128,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14289,26 +14173,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14343,30 +14220,21 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14399,26 +14267,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14451,26 +14312,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14505,27 +14359,23 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyBitmapShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -14551,10 +14401,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14581,10 +14435,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyBitmapShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14613,16 +14471,18 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyBitmapShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14659,31 +14519,23 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyBitmapShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14718,27 +14570,21 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14773,27 +14619,21 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14822,15 +14662,12 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -14858,15 +14695,12 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -14903,7 +14737,7 @@ static PyObject *_wrap_new_PyDrawnShape(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyDrawnShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDrawnShape, 1); return resultobj; fail: return NULL; @@ -14923,7 +14757,8 @@ static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -14949,7 +14784,8 @@ static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_CalculateSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CalculateSize(); @@ -14973,7 +14809,8 @@ static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_DestroyClippingRect",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DestroyClippingRect(); @@ -15006,7 +14843,8 @@ static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_DrawArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -15044,11 +14882,10 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawAtAngle(arg2); @@ -15079,19 +14916,16 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4); @@ -15121,7 +14955,8 @@ static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLine",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -15157,12 +14992,12 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3); @@ -15189,7 +15024,8 @@ static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawPoint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; @@ -15223,17 +15059,15 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(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_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15261,7 +15095,8 @@ static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawRectangle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -15294,15 +15129,14 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -15330,12 +15164,12 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSpline(arg2,arg3); @@ -15365,7 +15199,8 @@ static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawText",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -15407,7 +15242,8 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetAngle",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAngle(); @@ -15415,7 +15251,7 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -15432,7 +15268,8 @@ static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetMetaFile",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -15443,7 +15280,7 @@ static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPseudoMetaFile, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPseudoMetaFile, 0); return resultobj; fail: return NULL; @@ -15460,7 +15297,8 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_GetRotation",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetRotation(); @@ -15468,7 +15306,7 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -15488,7 +15326,8 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_LoadFromMetaFile",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -15501,7 +15340,9 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -15531,19 +15372,14 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -15570,7 +15406,8 @@ static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetClippingRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; @@ -15601,7 +15438,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; @@ -15631,11 +15469,10 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDrawnBackgroundMode(arg2); @@ -15663,7 +15500,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_SetDrawnBrush",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxBrush* temp; if (obj1) { @@ -15681,10 +15519,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args arg2 = NULL; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15711,7 +15547,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxFont* temp; if (obj1) { @@ -15761,7 +15598,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_SetDrawnPen",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxPen* temp; if (obj1) { @@ -15781,10 +15619,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args, arg2 = NULL; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15812,7 +15648,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnTextColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; @@ -15844,15 +15681,12 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scale(arg2,arg3); @@ -15878,11 +15712,10 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetSaveToFile",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSaveToFile(arg2); @@ -15910,15 +15743,12 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Translate(arg2,arg3); @@ -15942,7 +15772,8 @@ static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDrawnShape_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -15968,10 +15799,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15998,10 +15833,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16030,16 +15869,18 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16066,10 +15907,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16096,10 +15941,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16126,10 +15975,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16156,10 +16009,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16192,26 +16049,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16244,26 +16094,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16296,26 +16139,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16344,15 +16180,12 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -16389,32 +16222,26 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDrawnShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16423,7 +16250,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16451,38 +16280,32 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDrawnShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + if (obj6) { + arg7 = (bool) SWIG_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7); - - wxPyEndAllowThreads(__tstate); + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7); + + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; @@ -16511,30 +16334,21 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16567,26 +16381,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16619,26 +16426,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16673,30 +16473,21 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16729,26 +16520,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16781,26 +16565,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16835,27 +16612,23 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDrawnShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -16881,10 +16654,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16911,10 +16688,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16943,16 +16724,18 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16989,31 +16772,23 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDrawnShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17048,27 +16823,21 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17103,27 +16872,21 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17152,15 +16915,12 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -17188,15 +16948,12 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -17232,11 +16989,10 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail; - { - arg1 = (int) SWIG_PyObj_AsInt(obj0); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17264,7 +17020,8 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:OGLConstraint_Evaluate",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Evaluate(); @@ -17272,7 +17029,9 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17292,15 +17051,12 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_SetSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2,arg3); @@ -17329,15 +17085,12 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_Equals",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Equals(arg2,arg3); @@ -17345,7 +17098,9 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17374,7 +17129,7 @@ static PyObject *_wrap_new_PyCompositeShape(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyCompositeShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyCompositeShape, 1); return resultobj; fail: return NULL; @@ -17394,7 +17149,8 @@ static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -17424,10 +17180,13 @@ static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_AddChild",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17455,8 +17214,10 @@ static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_AddConstraint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxOGLConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2); @@ -17489,12 +17250,12 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg4 = obj3; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17528,13 +17289,14 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2,arg3,arg4); @@ -17560,7 +17322,8 @@ static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_CalculateSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CalculateSize(); @@ -17587,8 +17350,10 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_ContainsDivision",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ContainsDivision(arg2); @@ -17596,7 +17361,9 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17614,8 +17381,10 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_DeleteConstraint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxOGLConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeleteConstraint(arg2); @@ -17641,8 +17410,10 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_DeleteConstraintsInvolvingChild",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeleteConstraintsInvolvingChild(arg2); @@ -17667,7 +17438,8 @@ static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_FindContainerImage",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindContainerImage(); @@ -17694,7 +17466,8 @@ static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_GetConstraints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyCompositeShape_GetConstraints(arg1); @@ -17719,7 +17492,8 @@ static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_GetDivisions",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyCompositeShape_GetDivisions(arg1); @@ -17743,7 +17517,8 @@ static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_MakeContainer",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeContainer(); @@ -17768,7 +17543,8 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_Recompute",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Recompute(); @@ -17776,7 +17552,9 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -17794,8 +17572,10 @@ static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_RemoveChild",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveChild(arg2); @@ -17819,7 +17599,8 @@ static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCompositeShape_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -17845,10 +17626,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17875,10 +17660,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17907,16 +17696,18 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17943,10 +17734,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17973,10 +17768,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18003,10 +17802,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18033,10 +17836,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18069,26 +17876,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18121,26 +17921,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18173,26 +17966,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18221,15 +18007,12 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -18266,32 +18049,26 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCompositeShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18300,7 +18077,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18328,33 +18107,27 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCompositeShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + if (obj6) { + arg7 = (bool) SWIG_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnMovePost(*arg2,arg3,arg4,arg5,arg6,arg7); @@ -18388,30 +18161,21 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18444,26 +18208,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18496,26 +18253,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18550,30 +18300,21 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18606,26 +18347,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18658,26 +18392,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18712,27 +18439,23 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyCompositeShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -18758,10 +18481,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18788,10 +18515,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *self }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCompositeShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18820,16 +18551,18 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCompositeShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18866,31 +18599,23 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyCompositeShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18925,27 +18650,21 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *sel }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18980,27 +18699,21 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19029,15 +18742,12 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -19065,15 +18775,12 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -19108,16 +18815,12 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyDividedShape",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - { - arg1 = (double) SWIG_PyObj_AsDouble(obj0); - if (PyErr_Occurred()) SWIG_fail; - } + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19126,7 +18829,7 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyDividedShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDividedShape, 1); return resultobj; fail: return NULL; @@ -19146,7 +18849,8 @@ static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -19172,7 +18876,8 @@ static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_EditRegions",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EditRegions(); @@ -19196,7 +18901,8 @@ static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_SetRegionSizes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRegionSizes(); @@ -19220,7 +18926,8 @@ static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDividedShape_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -19246,10 +18953,14 @@ static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19276,10 +18987,14 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19308,16 +19023,18 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDividedShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19344,10 +19061,14 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19374,10 +19095,14 @@ static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19404,10 +19129,14 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19434,10 +19163,14 @@ static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19470,26 +19203,19 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19522,26 +19248,19 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19574,26 +19293,19 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19622,15 +19334,12 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -19667,32 +19376,26 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDividedShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19701,7 +19404,9 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -19729,32 +19434,26 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDividedShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19789,30 +19488,21 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19845,26 +19535,19 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19897,26 +19580,19 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19951,30 +19627,21 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20007,26 +19674,19 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20059,26 +19719,19 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20113,27 +19766,23 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDividedShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -20159,10 +19808,14 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20189,10 +19842,14 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDividedShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20221,16 +19878,18 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDividedShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20267,31 +19926,23 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDividedShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20326,27 +19977,21 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20381,27 +20026,21 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20430,15 +20069,12 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -20466,15 +20102,12 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -20533,7 +20166,8 @@ static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -20563,15 +20197,12 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustBottom",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AdjustBottom(arg2,arg3); @@ -20599,15 +20230,12 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustLeft",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AdjustLeft(arg2,arg3); @@ -20635,15 +20263,12 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustRight",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AdjustRight(arg2,arg3); @@ -20671,15 +20296,12 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustTop",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AdjustTop(arg2,arg3); @@ -20705,11 +20327,10 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_Divide",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Divide(arg2); @@ -20735,11 +20356,10 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_EditEdge",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EditEdge(arg2); @@ -20764,7 +20384,8 @@ static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetBottomSide",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyDivisionShape *)(arg1)->GetBottomSide(); @@ -20791,7 +20412,8 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetHandleSide",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetHandleSide(); @@ -20799,7 +20421,7 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -20816,7 +20438,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSide",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyDivisionShape *)(arg1)->GetLeftSide(); @@ -20843,7 +20466,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSideColour",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetLeftSideColour(); @@ -20874,7 +20498,8 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetLeftSidePen",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPen *)(arg1)->GetLeftSidePen(); @@ -20882,7 +20507,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0); return resultobj; fail: return NULL; @@ -20899,7 +20524,8 @@ static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetRightSide",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyDivisionShape *)(arg1)->GetRightSide(); @@ -20926,7 +20552,8 @@ static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetTopSide",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyDivisionShape *)(arg1)->GetTopSide(); @@ -20953,7 +20580,8 @@ static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_GetTopSidePen",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPen *)(arg1)->GetTopSidePen(); @@ -20961,7 +20589,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0); return resultobj; fail: return NULL; @@ -20983,19 +20611,14 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDivisionShape_ResizeAdjoining",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (bool) SWIG_PyObj_AsBool(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (bool) SWIG_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ResizeAdjoining(arg2,arg3,arg4); @@ -21023,15 +20646,12 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopupMenu(arg2,arg3); @@ -21057,8 +20677,10 @@ static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetBottomSide",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBottomSide(arg2); @@ -21084,11 +20706,10 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetHandleSide",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandleSide(arg2); @@ -21114,8 +20735,10 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSide",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLeftSide(arg2); @@ -21142,7 +20765,8 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSideColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -21181,7 +20805,8 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetLeftSidePen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxPen* temp; if (obj1) { @@ -21225,8 +20850,10 @@ static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetRightSide",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRightSide(arg2); @@ -21252,8 +20879,10 @@ static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSide",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTopSide(arg2); @@ -21280,7 +20909,8 @@ static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSideColour",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -21319,7 +20949,8 @@ static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetTopSidePen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxPen* temp; if (obj1) { @@ -21361,7 +20992,8 @@ static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyDivisionShape_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -21387,10 +21019,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21417,10 +21053,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21449,16 +21089,18 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDivisionShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21485,10 +21127,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21515,10 +21161,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21545,10 +21195,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21575,10 +21229,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21611,26 +21269,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21663,26 +21314,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21715,26 +21359,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21763,15 +21400,12 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -21808,32 +21442,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDivisionShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21842,7 +21470,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21870,32 +21500,26 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDivisionShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21930,30 +21554,21 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21986,26 +21601,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22038,26 +21646,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22092,30 +21693,21 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22148,26 +21740,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22200,26 +21785,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22254,27 +21832,23 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDivisionShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -22300,10 +21874,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22330,10 +21908,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22362,16 +21944,18 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDivisionShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22408,31 +21992,23 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDivisionShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22467,27 +22043,21 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22522,27 +22092,21 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22571,15 +22135,12 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -22607,15 +22168,12 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -22650,16 +22208,12 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEllipseShape",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - { - arg1 = (double) SWIG_PyObj_AsDouble(obj0); - if (PyErr_Occurred()) SWIG_fail; - } + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22668,7 +22222,7 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyEllipseShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyEllipseShape, 1); return resultobj; fail: return NULL; @@ -22688,7 +22242,8 @@ static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -22716,10 +22271,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22746,10 +22305,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22778,16 +22341,18 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyEllipseShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22814,10 +22379,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22844,10 +22413,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22874,10 +22447,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22904,10 +22481,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22940,26 +22521,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22992,26 +22566,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23044,26 +22611,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23092,15 +22652,12 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -23137,32 +22694,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyEllipseShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23171,7 +22722,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23199,32 +22752,26 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyEllipseShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23259,30 +22806,21 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23315,26 +22853,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23367,26 +22898,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23421,30 +22945,21 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23477,26 +22992,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23529,26 +23037,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23583,27 +23084,23 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyEllipseShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -23629,10 +23126,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23659,10 +23160,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEllipseShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23691,16 +23196,18 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyEllipseShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23737,31 +23244,23 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyEllipseShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23796,27 +23295,21 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23851,27 +23344,21 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23900,15 +23387,12 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -23936,15 +23420,12 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -23977,10 +23458,8 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyCircleShape",kwnames,&obj0)) goto fail; if (obj0) { - { - arg1 = (double) SWIG_PyObj_AsDouble(obj0); - if (PyErr_Occurred()) SWIG_fail; - } + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23989,7 +23468,7 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyCircleShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyCircleShape, 1); return resultobj; fail: return NULL; @@ -24009,7 +23488,8 @@ static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -24037,10 +23517,14 @@ static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24067,10 +23551,14 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24099,16 +23587,18 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCircleShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24135,10 +23625,14 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24165,10 +23659,14 @@ static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24195,10 +23693,14 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24225,10 +23727,14 @@ static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24261,26 +23767,19 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24313,26 +23812,19 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24365,26 +23857,19 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24413,15 +23898,12 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -24458,32 +23940,26 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCircleShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24492,7 +23968,9 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -24520,32 +23998,26 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCircleShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24580,30 +24052,21 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24636,26 +24099,19 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24688,26 +24144,19 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24742,30 +24191,21 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24798,26 +24238,19 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24850,26 +24283,19 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24904,27 +24330,23 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyCircleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -24950,10 +24372,14 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24980,10 +24406,14 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCircleShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25012,16 +24442,18 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyCircleShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25058,31 +24490,23 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyCircleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25117,27 +24541,21 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25172,27 +24590,21 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25221,15 +24633,12 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -25257,15 +24666,12 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -25312,28 +24718,20 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOOO:new_ArrowHead",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if (obj0) { - { - arg1 = (int) SWIG_PyObj_AsInt(obj0); - if (PyErr_Occurred()) SWIG_fail; - } + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; } - if (obj3) { - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if (obj3) { + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { { @@ -25343,13 +24741,12 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k } } if (obj5) { - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj6) { - { - arg7 = (long) SWIG_PyObj_AsLong(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (long) SWIG_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25384,7 +24781,8 @@ static PyObject *_wrap_delete_ArrowHead(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ArrowHead",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -25409,7 +24807,8 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead__GetType",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->_GetType(); @@ -25417,7 +24816,7 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -25434,7 +24833,8 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetPosition",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetPosition(); @@ -25442,7 +24842,7 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -25460,11 +24860,10 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetPosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -25489,7 +24888,8 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetXOffset",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetXOffset(); @@ -25497,7 +24897,7 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -25514,7 +24914,8 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetYOffset",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetYOffset(); @@ -25522,7 +24923,7 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -25539,7 +24940,8 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetSpacing",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetSpacing(); @@ -25547,7 +24949,7 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -25564,7 +24966,8 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetSize(); @@ -25572,7 +24975,7 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -25589,7 +24992,8 @@ static PyObject *_wrap_ArrowHead_GetName(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetName",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetName(); @@ -25621,11 +25025,10 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetXOffset",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetXOffset(arg2); @@ -25651,11 +25054,10 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetYOffset",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetYOffset(arg2); @@ -25680,7 +25082,8 @@ static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetMetaFile",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPseudoMetaFile *)(arg1)->GetMetaFile(); @@ -25707,7 +25110,8 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetId",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->GetId(); @@ -25715,7 +25119,7 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -25732,7 +25136,8 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetArrowEnd",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetArrowEnd(); @@ -25740,7 +25145,7 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -25757,7 +25162,8 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArrowHead_GetArrowSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetArrowSize(); @@ -25765,7 +25171,7 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -25783,11 +25189,10 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSize",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2); @@ -25813,11 +25218,10 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSpacing",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2); @@ -25854,7 +25258,7 @@ static PyObject *_wrap_new_PyLineShape(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyLineShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyLineShape, 1); return resultobj; fail: return NULL; @@ -25874,7 +25278,8 @@ static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -25916,28 +25321,21 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:PyLineShape_AddArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { { @@ -25947,13 +25345,12 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb } } if (obj6) { - if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj6,(void **)(&arg7),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj7) { - { - arg8 = (long) SWIG_PyObj_AsLong(obj7); - if (PyErr_Occurred()) SWIG_fail; - } + arg8 = (long) SWIG_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25992,13 +25389,13 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyLineShape_AddArrowOrdered",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg3 = obj2; - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyLineShape_AddArrowOrdered(arg1,arg2,arg3,arg4); @@ -26026,7 +25423,8 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_ClearArrow",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; @@ -26039,7 +25437,9 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -26065,12 +25465,11 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_ClearArrowsAtPosition",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26103,20 +25502,21 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (bool) SWIG_PyObj_AsBool(obj4); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (bool) SWIG_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawArrow(*arg2,arg3,arg4,arg5); @@ -26143,11 +25543,10 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (long) SWIG_PyObj_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteArrowHead(arg2); @@ -26155,7 +25554,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26177,11 +25578,10 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26194,7 +25594,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp3) delete arg3; @@ -26219,7 +25621,8 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_DeleteLineControlPoint",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteLineControlPoint(); @@ -26227,7 +25630,9 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26245,10 +25650,14 @@ static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DrawArrows",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26281,20 +25690,21 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRegion(*arg2,arg3,arg4,arg5); @@ -26326,20 +25736,21 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_EraseRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EraseRegion(*arg2,arg3,arg4,arg5); @@ -26366,11 +25777,10 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_FindArrowHeadId",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (long) SWIG_PyObj_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxArrowHead *)(arg1)->FindArrowHead(arg2); @@ -26402,11 +25812,10 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26457,7 +25866,8 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *a arg4 = &temp4; arg5 = &temp5; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindLineEndPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FindLineEndPoints(arg2,arg3,arg4,arg5); @@ -26502,15 +25912,12 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindLinePosition",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->FindLinePosition(arg2,arg3); @@ -26518,7 +25925,7 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -26535,7 +25942,8 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindMinimumWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->FindMinimumWidth(); @@ -26543,7 +25951,7 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -26569,12 +25977,12 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj arg3 = &temp3; arg4 = &temp4; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindNth",kwnames,&obj0,&obj1,&obj2)) goto fail; - 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_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg5 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FindNth(arg2,arg3,arg4,arg5); @@ -26607,7 +26015,8 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAttachmentFrom",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAttachmentFrom(); @@ -26615,7 +26024,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -26632,7 +26041,8 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAttachmentTo",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAttachmentTo(); @@ -26640,7 +26050,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -26668,7 +26078,8 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObj arg4 = &temp4; arg5 = &temp5; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetEnds",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetEnds(arg2,arg3,arg4,arg5); @@ -26709,7 +26120,8 @@ static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetFrom",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->GetFrom(); @@ -26743,11 +26155,10 @@ static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *self, PyObject *ar arg3 = &temp3; arg4 = &temp4; 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_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetLabelPosition(arg2,arg3,arg4); @@ -26782,8 +26193,10 @@ static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetNextControlPoint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRealPoint *)(arg1)->GetNextControlPoint(arg2); @@ -26791,7 +26204,7 @@ static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxRealPoint, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRealPoint, 0); return resultobj; fail: return NULL; @@ -26808,7 +26221,8 @@ static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetTo",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->GetTo(); @@ -26834,7 +26248,8 @@ static PyObject *_wrap_PyLineShape_Initialise(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Initialise",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Initialise(); @@ -26860,8 +26275,10 @@ static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_InsertLineControlPoint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->InsertLineControlPoint(arg2); @@ -26888,8 +26305,10 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_IsEnd",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsEnd(arg2); @@ -26897,7 +26316,9 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26914,7 +26335,8 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_IsSpline",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsSpline(); @@ -26922,7 +26344,9 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26940,11 +26364,10 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeLineControlPoints(arg2); @@ -26969,7 +26392,8 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetLineControlPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyLineShape_GetLineControlPoints(arg1); @@ -26984,6 +26408,34 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject } +static PyObject *_wrap_PyLineShape_SetLineControlPoints(PyObject *self, 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 *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyLineShape *arg1 = (wxPyLineShape *) 0 ; @@ -26995,11 +26447,10 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentFrom(arg2); @@ -27027,15 +26478,12 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAttachments",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachments(arg2,arg3); @@ -27061,11 +26509,10 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentTo",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentTo(arg2); @@ -27097,23 +26544,16 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_SetEnds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEnds(arg2,arg3,arg4,arg5); @@ -27139,8 +26579,10 @@ static PyObject *_wrap_PyLineShape_SetFrom(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetFrom",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFrom(arg2); @@ -27166,11 +26608,10 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetIgnoreOffsets",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetIgnoreOffsets(arg2); @@ -27196,11 +26637,10 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetSpline",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpline(arg2); @@ -27226,8 +26666,10 @@ static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetTo",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTo(arg2); @@ -27253,9 +26695,11 @@ static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_Straighten",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27280,7 +26724,8 @@ static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_Unlink",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Unlink(); @@ -27308,15 +26753,12 @@ static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignmentOrientation(arg2,arg3); @@ -27344,15 +26786,12 @@ static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentType",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignmentType(arg2,arg3); @@ -27379,11 +26818,10 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentOrientation",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetAlignmentOrientation(arg2); @@ -27391,7 +26829,9 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27410,11 +26850,10 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentType",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAlignmentType(arg2); @@ -27422,7 +26861,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -27439,7 +26878,8 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAlignmentStart",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyLineShape const *)arg1)->GetAlignmentStart(); @@ -27447,7 +26887,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -27464,7 +26904,8 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetAlignmentEnd",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyLineShape const *)arg1)->GetAlignmentEnd(); @@ -27472,7 +26913,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -27490,10 +26931,14 @@ static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27520,10 +26965,14 @@ static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27552,16 +27001,18 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLineShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27588,10 +27039,14 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27618,10 +27073,14 @@ static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27648,10 +27107,14 @@ static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27678,10 +27141,14 @@ static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27714,26 +27181,19 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27766,26 +27226,19 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27818,26 +27271,19 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27866,15 +27312,12 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -27911,32 +27354,26 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27945,7 +27382,9 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -27965,40 +27404,34 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28033,30 +27466,21 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28089,26 +27513,19 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28141,26 +27558,19 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28195,30 +27605,21 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28251,26 +27652,19 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28303,26 +27697,19 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28357,27 +27744,23 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyLineShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -28403,10 +27786,14 @@ static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28433,10 +27820,14 @@ static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28465,16 +27856,18 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLineShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28511,31 +27904,23 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyLineShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28570,27 +27955,21 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28625,27 +28004,21 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28674,15 +28047,12 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -28710,15 +28080,12 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -28755,7 +28122,7 @@ static PyObject *_wrap_new_PyPolygonShape(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyPolygonShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyPolygonShape, 1); return resultobj; fail: return NULL; @@ -28775,7 +28142,8 @@ static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -28804,7 +28172,8 @@ static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_Create",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28831,12 +28200,11 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyPolygonShape_AddPolygonPoint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28861,7 +28229,8 @@ static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_CalculatePolygonCentre",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CalculatePolygonCentre(); @@ -28887,12 +28256,11 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyPolygonShape_DeletePolygonPoint",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28918,7 +28286,8 @@ static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyPolygonShape_GetPoints(arg1); @@ -28943,7 +28312,8 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyPolygonShape_GetOriginalPoints(arg1); @@ -28968,7 +28338,8 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalWidth",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)((wxPyPolygonShape const *)arg1)->GetOriginalWidth(); @@ -28976,7 +28347,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -28993,7 +28364,8 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_GetOriginalHeight",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)((wxPyPolygonShape const *)arg1)->GetOriginalHeight(); @@ -29001,7 +28373,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -29019,11 +28391,10 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOriginalWidth(arg2); @@ -29049,11 +28420,10 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOriginalHeight(arg2); @@ -29077,7 +28447,8 @@ static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPolygonShape_UpdateOriginalPoints",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->UpdateOriginalPoints(); @@ -29103,10 +28474,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29133,10 +28508,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29165,16 +28544,18 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyPolygonShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29201,10 +28582,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29231,10 +28616,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29261,10 +28650,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29291,10 +28684,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29327,26 +28724,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29379,26 +28769,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29431,26 +28814,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29479,15 +28855,12 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -29524,32 +28897,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyPolygonShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29558,7 +28925,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -29586,32 +28955,26 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyPolygonShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29646,30 +29009,21 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29702,26 +29056,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29754,26 +29101,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29808,30 +29148,21 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29864,26 +29195,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29916,26 +29240,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29970,27 +29287,23 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyPolygonShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -30016,10 +29329,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30046,10 +29363,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30078,16 +29399,18 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyPolygonShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30124,31 +29447,23 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyPolygonShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30183,27 +29498,21 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30238,27 +29547,21 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30287,15 +29590,12 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -30323,15 +29623,12 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -30366,16 +29663,12 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyTextShape",kwnames,&obj0,&obj1)) goto fail; if (obj0) { - { - arg1 = (double) SWIG_PyObj_AsDouble(obj0); - if (PyErr_Occurred()) SWIG_fail; - } + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; } if (obj1) { - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30384,7 +29677,7 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyTextShape, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTextShape, 1); return resultobj; fail: return NULL; @@ -30404,7 +29697,8 @@ static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -30430,7 +29724,8 @@ static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyTextShape_base_OnDelete",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDelete(); @@ -30456,10 +29751,14 @@ static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30486,10 +29785,14 @@ static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDrawContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30518,16 +29821,18 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyTextShape_base_OnDrawBranches",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30554,10 +29859,14 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnMoveLinks",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30584,10 +29893,14 @@ static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnErase",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30614,10 +29927,14 @@ static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnEraseContents",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30644,10 +29961,14 @@ static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnHighlight",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30680,26 +30001,19 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30732,26 +30046,19 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30784,26 +30091,19 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30832,15 +30132,12 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -30877,32 +30174,26 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyTextShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30911,7 +30202,9 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -30939,32 +30232,26 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyTextShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SWIG_PyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30999,30 +30286,21 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31055,26 +30333,19 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31104,29 +30375,22 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject * PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL - }; - - 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_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31161,30 +30425,21 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31217,26 +30472,19 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31269,26 +30517,19 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31323,27 +30564,23 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyTextShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -31369,10 +30606,14 @@ static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnDrawControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31399,10 +30640,14 @@ static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *self, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyTextShape_base_OnEraseControlPoints",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31431,16 +30676,18 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyTextShape_base_OnMoveLink",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } if (obj2) { - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31477,31 +30724,23 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyTextShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } if (obj6) { - { - arg7 = (int) SWIG_PyObj_AsInt(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31536,27 +30775,21 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31591,27 +30824,21 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { - { - arg6 = (int) SWIG_PyObj_AsInt(obj5); - if (PyErr_Occurred()) SWIG_fail; - } + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31640,15 +30867,12 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *ar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -31676,15 +30900,12 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -31743,10 +30964,13 @@ static PyObject *_wrap_Diagram_AddShape(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Diagram_AddShape",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31773,10 +30997,14 @@ static PyObject *_wrap_Diagram_Clear(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_Clear",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -31801,7 +31029,8 @@ static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_DeleteAllShapes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeleteAllShapes(); @@ -31835,27 +31064,23 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Diagram_DrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (double) SWIG_PyObj_AsDouble(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg6 = (double) SWIG_PyObj_AsDouble(obj5); - if (PyErr_Occurred()) SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -31882,11 +31107,10 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_FindShape",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (long) SWIG_PyObj_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindShape(arg2); @@ -31913,7 +31137,8 @@ static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetCanvas",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShapeCanvas *)(arg1)->GetCanvas(); @@ -31940,7 +31165,8 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetCount(); @@ -31948,7 +31174,7 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -31965,7 +31191,8 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetGridSpacing",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetGridSpacing(); @@ -31973,7 +31200,7 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromDouble((double)result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -31990,7 +31217,8 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetMouseTolerance",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetMouseTolerance(); @@ -31998,7 +31226,7 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -32015,7 +31243,8 @@ static PyObject *_wrap_Diagram_GetShapeList(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetShapeList",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxDiagram_GetShapeList(arg1); @@ -32040,7 +31269,8 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetQuickEditMode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetQuickEditMode(); @@ -32048,7 +31278,9 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32065,7 +31297,8 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_GetSnapToGrid",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetSnapToGrid(); @@ -32073,7 +31306,9 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32091,8 +31326,10 @@ static PyObject *_wrap_Diagram_InsertShape(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_InsertShape",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->InsertShape(arg2); @@ -32118,10 +31355,14 @@ static PyObject *_wrap_Diagram_RecentreAll(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_RecentreAll",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32148,10 +31389,14 @@ static PyObject *_wrap_Diagram_Redraw(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_Redraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32176,7 +31421,8 @@ static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Diagram_RemoveAllShapes",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveAllShapes(); @@ -32202,8 +31448,10 @@ static PyObject *_wrap_Diagram_RemoveShape(PyObject *self, PyObject *args, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_RemoveShape",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveShape(arg2); @@ -32229,8 +31477,10 @@ static PyObject *_wrap_Diagram_SetCanvas(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetCanvas",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCanvas(arg2); @@ -32256,11 +31506,10 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetGridSpacing",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetGridSpacing(arg2); @@ -32286,11 +31535,10 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetMouseTolerance",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMouseTolerance(arg2); @@ -32316,11 +31564,10 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetQuickEditMode",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetQuickEditMode(arg2); @@ -32346,11 +31593,10 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetSnapToGrid",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSnapToGrid(arg2); @@ -32376,11 +31622,10 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_ShowAll",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ShowAll(arg2); @@ -32410,7 +31655,8 @@ static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Diagram_Snap",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { temp2 = PyFloat_AsDouble(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -32477,13 +31723,12 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_PyShapeCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { @@ -32498,10 +31743,8 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec } } if (obj4) { - { - arg5 = (long) SWIG_PyObj_AsLong(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (long) SWIG_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; } if (obj5) { { @@ -32547,7 +31790,8 @@ static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeCanvas__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; { @@ -32577,10 +31821,13 @@ static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShapeCanvas_AddShape",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32617,20 +31864,19 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P arg4 = &temp4; 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_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxClassInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg5),SWIGTYPE_p_wxClassInfo, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } if (obj4) { - if ((SWIG_ConvertPtr(obj4,(void **) &arg6, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **)(&arg6),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32671,19 +31917,14 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO arg4 = &temp4; 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_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindFirstSensitiveShape(arg2,arg3,arg4,arg5); @@ -32714,7 +31955,8 @@ static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeCanvas_GetDiagram",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDiagram *)(arg1)->GetDiagram(); @@ -32741,7 +31983,8 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShapeCanvas_GetQuickEditMode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetQuickEditMode(); @@ -32749,7 +31992,9 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -32767,8 +32012,10 @@ static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_InsertShape",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->InsertShape(arg2); @@ -32798,20 +32045,15 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32842,20 +32084,15 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObj }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32886,20 +32123,15 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32930,20 +32162,15 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32976,24 +32203,17 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *a }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33026,24 +32246,17 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg4 = (double) SWIG_PyObj_AsDouble(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (int) SWIG_PyObj_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33074,20 +32287,15 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33118,20 +32326,15 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (double) SWIG_PyObj_AsDouble(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (double) SWIG_PyObj_AsDouble(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33158,10 +32361,14 @@ static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *self, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_Redraw",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33188,8 +32395,10 @@ static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_RemoveShape",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveShape(arg2); @@ -33215,8 +32424,10 @@ static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *self, PyObject *args, }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShapeCanvas_SetDiagram",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDiagram(arg2); @@ -33246,7 +32457,8 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeCanvas_Snap",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { temp2 = PyFloat_AsDouble(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -34033,6 +33245,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyLineShape_IsSpline", (PyCFunction) _wrap_PyLineShape_IsSpline, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_MakeLineControlPoints", (PyCFunction) _wrap_PyLineShape_MakeLineControlPoints, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_GetLineControlPoints", (PyCFunction) _wrap_PyLineShape_GetLineControlPoints, METH_VARARGS | METH_KEYWORDS }, + { (char *)"PyLineShape_SetLineControlPoints", (PyCFunction) _wrap_PyLineShape_SetLineControlPoints, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_SetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_SetAttachmentFrom, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_SetAttachments", (PyCFunction) _wrap_PyLineShape_SetAttachments, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyLineShape_SetAttachmentTo", (PyCFunction) _wrap_PyLineShape_SetAttachmentTo, METH_VARARGS | METH_KEYWORDS }, @@ -34213,6 +33426,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)); } @@ -34234,6 +33450,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)); } @@ -34312,6 +33531,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)); } @@ -34717,6 +33939,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)); } @@ -34951,6 +34176,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)); } @@ -35080,48 +34308,47 @@ static void *_p_wxPyDividedShapeTo_p_wxPyRectangleShape(void *x) { static void *_p_wxPyDivisionShapeTo_p_wxPyCompositeShape(void *x) { return (void *)((wxPyCompositeShape *) ((wxPyDivisionShape *) x)); } -static swig_type_info _swigt__p_wxOGLConstraint[] = {{"_p_wxOGLConstraint", 0, "wxOGLConstraint *", 0},{"_p_wxOGLConstraint"},{0}}; -static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0},{"_p_wxBrush"},{0}}; -static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}}; -static swig_type_info _swigt__p_wxShapeRegion[] = {{"_p_wxShapeRegion", 0, "wxShapeRegion *", 0},{"_p_wxShapeRegion"},{0}}; -static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}}; -static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0},{"_p_wxRealPoint"},{0}}; -static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, "wxPyControlPoint *", 0},{"_p_wxPyControlPoint"},{0}}; -static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0},{"_p_wxArrowHead"},{0}}; -static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; -static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0},{"_p_wxStringList"},{0}}; -static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; -static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0},{"_p_bool"},{0}}; -static swig_type_info _swigt__p_wxList[] = {{"_p_wxList", 0, "wxList *", 0},{"_p_wxList"},{0}}; -static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; -static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow},{0}}; -static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; -static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}}; -static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0},{"_p_wxPyDrawnShape"},{0}}; -static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0},{"_p_wxPyDivisionShape"},{0}}; -static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0},{"_p_wxPyPolygonShape"},{0}}; -static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject},{0}}; -static swig_type_info _swigt__p_wxPyBitmapShape[] = {{"_p_wxPyBitmapShape", 0, "wxPyBitmapShape *", 0},{"_p_wxPyBitmapShape"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; -static swig_type_info _swigt__p_wxPyShapeEvtHandler[] = {{"_p_wxPyShapeEvtHandler", 0, "wxPyShapeEvtHandler *", 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShapeEvtHandler},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyShapeEvtHandler"},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShapeEvtHandler},{0}}; -static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{0}}; -static swig_type_info _swigt__p_wxPyEllipseShape[] = {{"_p_wxPyEllipseShape", 0, "wxPyEllipseShape *", 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyEllipseShape},{"_p_wxPyEllipseShape"},{0}}; -static swig_type_info _swigt__p_wxPyShapeCanvas[] = {{"_p_wxPyShapeCanvas", 0, "wxPyShapeCanvas *", 0},{"_p_wxPyShapeCanvas"},{0}}; -static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}}; -static swig_type_info _swigt__p_wxDiagram[] = {{"_p_wxDiagram", 0, "wxDiagram *", 0},{"_p_wxDiagram"},{0}}; -static swig_type_info _swigt__p_wxPyShape[] = {{"_p_wxPyShape", 0, "wxPyShape *", 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShape},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShape},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShape},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShape},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShape},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShape},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShape},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShape},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShape},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShape},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShape},{"_p_wxPyShape"},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShape},{0}}; -static swig_type_info _swigt__p_wxAttachmentPoint[] = {{"_p_wxAttachmentPoint", 0, "wxAttachmentPoint *", 0},{"_p_wxAttachmentPoint"},{0}}; -static swig_type_info _swigt__p_wxClassInfo[] = {{"_p_wxClassInfo", 0, "wxClassInfo *", 0},{"_p_wxClassInfo"},{0}}; -static swig_type_info _swigt__p_wxPyLineShape[] = {{"_p_wxPyLineShape", 0, "wxPyLineShape *", 0},{"_p_wxPyLineShape"},{0}}; -static swig_type_info _swigt__p_wxPyRectangleShape[] = {{"_p_wxPyRectangleShape", 0, "wxPyRectangleShape *", 0},{"_p_wxPyRectangleShape"},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyRectangleShape},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyRectangleShape},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyRectangleShape},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyRectangleShape},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyRectangleShape},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyRectangleShape},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyRectangleShape},{0}}; -static swig_type_info _swigt__p_wxPyCompositeShape[] = {{"_p_wxPyCompositeShape", 0, "wxPyCompositeShape *", 0},{"_p_wxPyCompositeShape"},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyCompositeShape},{0}}; -static swig_type_info _swigt__p_wxPyCircleShape[] = {{"_p_wxPyCircleShape", 0, "wxPyCircleShape *", 0},{"_p_wxPyCircleShape"},{0}}; -static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0},{"_p_wxPen"},{0}}; -static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; -static swig_type_info _swigt__p_wxPseudoMetaFile[] = {{"_p_wxPseudoMetaFile", 0, "wxPseudoMetaFile *", 0},{"_p_wxPseudoMetaFile"},{0}}; -static swig_type_info _swigt__p_wxPyTextShape[] = {{"_p_wxPyTextShape", 0, "wxPyTextShape *", 0},{"_p_wxPyTextShape"},{0}}; -static swig_type_info _swigt__p_wxPyDividedShape[] = {{"_p_wxPyDividedShape", 0, "wxPyDividedShape *", 0},{"_p_wxPyDividedShape"},{0}}; +static swig_type_info _swigt__p_wxOGLConstraint[] = {{"_p_wxOGLConstraint", 0, "wxOGLConstraint *", 0, 0, 0, 0},{"_p_wxOGLConstraint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0, 0, 0, 0},{"_p_wxBrush", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxShapeRegion[] = {{"_p_wxShapeRegion", 0, "wxShapeRegion *", 0, 0, 0, 0},{"_p_wxShapeRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0, 0, 0, 0},{"_p_wxRealPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, "wxPyControlPoint *", 0, 0, 0, 0},{"_p_wxPyControlPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0, 0, 0, 0},{"_p_wxArrowHead", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0, 0, 0, 0},{"_p_wxStringList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0, 0, 0, 0},{"_p_bool", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxList[] = {{"_p_wxList", 0, "wxList *", 0, 0, 0, 0},{"_p_wxList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0, 0, 0, 0},{"_p_double", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0, 0, 0, 0},{"_p_wxPyDivisionShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0, 0, 0, 0},{"_p_wxPyDrawnShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0, 0, 0, 0},{"_p_wxPyPolygonShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyBitmapShape[] = {{"_p_wxPyBitmapShape", 0, "wxPyBitmapShape *", 0, 0, 0, 0},{"_p_wxPyBitmapShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyShapeEvtHandler[] = {{"_p_wxPyShapeEvtHandler", 0, "wxPyShapeEvtHandler *", 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyShapeEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShapeEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyEllipseShape[] = {{"_p_wxPyEllipseShape", 0, "wxPyEllipseShape *", 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyEllipseShape, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyShapeCanvas[] = {{"_p_wxPyShapeCanvas", 0, "wxPyShapeCanvas *", 0, 0, 0, 0},{"_p_wxPyShapeCanvas", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxDiagram[] = {{"_p_wxDiagram", 0, "wxDiagram *", 0, 0, 0, 0},{"_p_wxDiagram", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyShape[] = {{"_p_wxPyShape", 0, "wxPyShape *", 0, 0, 0, 0},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{"_p_wxPyShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxAttachmentPoint[] = {{"_p_wxAttachmentPoint", 0, "wxAttachmentPoint *", 0, 0, 0, 0},{"_p_wxAttachmentPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxClassInfo[] = {{"_p_wxClassInfo", 0, "wxClassInfo *", 0, 0, 0, 0},{"_p_wxClassInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyLineShape[] = {{"_p_wxPyLineShape", 0, "wxPyLineShape *", 0, 0, 0, 0},{"_p_wxPyLineShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyRectangleShape[] = {{"_p_wxPyRectangleShape", 0, "wxPyRectangleShape *", 0, 0, 0, 0},{"_p_wxPyRectangleShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyRectangleShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyCompositeShape[] = {{"_p_wxPyCompositeShape", 0, "wxPyCompositeShape *", 0, 0, 0, 0},{"_p_wxPyCompositeShape", 0, 0, 0, 0, 0, 0},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyCompositeShape, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyCircleShape[] = {{"_p_wxPyCircleShape", 0, "wxPyCircleShape *", 0, 0, 0, 0},{"_p_wxPyCircleShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0, 0, 0, 0},{"_p_wxPen", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPseudoMetaFile[] = {{"_p_wxPseudoMetaFile", 0, "wxPseudoMetaFile *", 0, 0, 0, 0},{"_p_wxPseudoMetaFile", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyTextShape[] = {{"_p_wxPyTextShape", 0, "wxPyTextShape *", 0, 0, 0, 0},{"_p_wxPyTextShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyDividedShape[] = {{"_p_wxPyDividedShape", 0, "wxPyDividedShape *", 0, 0, 0, 0},{"_p_wxPyDividedShape", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info *swig_types_initial[] = { _swigt__p_wxOGLConstraint, @@ -35141,13 +34368,12 @@ _swigt__p_wxFont, _swigt__p_wxScrolledWindow, _swigt__p_wxWindow, _swigt__p_double, -_swigt__p_wxPyDrawnShape, _swigt__p_wxPyDivisionShape, +_swigt__p_wxPyDrawnShape, _swigt__p_wxPyPolygonShape, _swigt__p_wxBitmap, _swigt__p_wxObject, _swigt__p_wxPyBitmapShape, -_swigt__p_wxString, _swigt__p_wxPyShapeEvtHandler, _swigt__p_wxEvtHandler, _swigt__p_wxPyEllipseShape, @@ -35199,70 +34425,70 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); - PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_PyObj_FromInt((int)oglMETAFLAGS_OUTLINE)); - PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_PyObj_FromInt((int)oglMETAFLAGS_ATTACHMENTS)); - PyDict_SetItemString(d,"KEY_SHIFT", SWIG_PyObj_FromInt((int)KEY_SHIFT)); - PyDict_SetItemString(d,"KEY_CTRL", SWIG_PyObj_FromInt((int)KEY_CTRL)); - PyDict_SetItemString(d,"ARROW_NONE", SWIG_PyObj_FromInt((int)ARROW_NONE)); - PyDict_SetItemString(d,"ARROW_END", SWIG_PyObj_FromInt((int)ARROW_END)); - PyDict_SetItemString(d,"ARROW_BOTH", SWIG_PyObj_FromInt((int)ARROW_BOTH)); - PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_PyObj_FromInt((int)ARROW_MIDDLE)); - PyDict_SetItemString(d,"ARROW_START", SWIG_PyObj_FromInt((int)ARROW_START)); - PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_HOLLOW_CIRCLE)); - PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_FILLED_CIRCLE)); - PyDict_SetItemString(d,"ARROW_ARROW", SWIG_PyObj_FromInt((int)ARROW_ARROW)); - PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_SINGLE_OBLIQUE)); - PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_DOUBLE_OBLIQUE)); - PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_PyObj_FromInt((int)ARROW_METAFILE)); - PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_PyObj_FromInt((int)ARROW_POSITION_END)); - PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_PyObj_FromInt((int)ARROW_POSITION_START)); - PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_VERTICAL)); - PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_HORIZONTAL)); - PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_DIAGONAL)); - PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_TO)); - PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_FROM)); - PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_PyObj_FromInt((int)CONTROL_POINT_LINE)); - PyDict_SetItemString(d,"FORMAT_NONE", SWIG_PyObj_FromInt((int)FORMAT_NONE)); - PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_HORIZ)); - PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_VERT)); - PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_PyObj_FromInt((int)FORMAT_SIZE_TO_CONTENTS)); - PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_HORIZ)); - PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_VERT)); - PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE)); - PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_NONE)); - PyDict_SetItemString(d,"SHADOW_NONE", SWIG_PyObj_FromInt((int)SHADOW_NONE)); - PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_PyObj_FromInt((int)SHADOW_LEFT)); - PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_PyObj_FromInt((int)SHADOW_RIGHT)); - PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_PyObj_FromInt((int)OP_CLICK_LEFT)); - PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_PyObj_FromInt((int)OP_CLICK_RIGHT)); - PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_PyObj_FromInt((int)OP_DRAG_LEFT)); - PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_PyObj_FromInt((int)OP_DRAG_RIGHT)); - PyDict_SetItemString(d,"OP_ALL", SWIG_PyObj_FromInt((int)OP_ALL)); - PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_NONE)); - PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_EDGE)); - PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_BRANCHING)); - PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_NORMAL)); - PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_BLOB)); - PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY)); - PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY)); - PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_BOTH)); - PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_LEFT_OF)); - PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_RIGHT_OF)); - PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ABOVE)); - PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_PyObj_FromInt((int)gyCONSTRAINT_BELOW)); - PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_TOP)); - PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM)); - PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT)); - PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT)); - PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP)); - PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM)); - PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT)); - PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT)); - PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_PyObj_FromInt((int)DIVISION_SIDE_NONE)); - PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_LEFT)); - PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_PyObj_FromInt((int)DIVISION_SIDE_TOP)); - PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_RIGHT)); - PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_PyObj_FromInt((int)DIVISION_SIDE_BOTTOM)); + PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_FromInt((int)oglMETAFLAGS_OUTLINE)); + PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_FromInt((int)oglMETAFLAGS_ATTACHMENTS)); + PyDict_SetItemString(d,"KEY_SHIFT", SWIG_FromInt((int)KEY_SHIFT)); + PyDict_SetItemString(d,"KEY_CTRL", SWIG_FromInt((int)KEY_CTRL)); + PyDict_SetItemString(d,"ARROW_NONE", SWIG_FromInt((int)ARROW_NONE)); + PyDict_SetItemString(d,"ARROW_END", SWIG_FromInt((int)ARROW_END)); + PyDict_SetItemString(d,"ARROW_BOTH", SWIG_FromInt((int)ARROW_BOTH)); + PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_FromInt((int)ARROW_MIDDLE)); + PyDict_SetItemString(d,"ARROW_START", SWIG_FromInt((int)ARROW_START)); + PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_FromInt((int)ARROW_HOLLOW_CIRCLE)); + PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_FromInt((int)ARROW_FILLED_CIRCLE)); + PyDict_SetItemString(d,"ARROW_ARROW", SWIG_FromInt((int)ARROW_ARROW)); + PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_FromInt((int)ARROW_SINGLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_FromInt((int)ARROW_DOUBLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_FromInt((int)ARROW_METAFILE)); + PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_FromInt((int)ARROW_POSITION_END)); + PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_FromInt((int)ARROW_POSITION_START)); + PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_FromInt((int)CONTROL_POINT_VERTICAL)); + PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_FromInt((int)CONTROL_POINT_HORIZONTAL)); + PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_FromInt((int)CONTROL_POINT_DIAGONAL)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_TO)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_FROM)); + PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_FromInt((int)CONTROL_POINT_LINE)); + PyDict_SetItemString(d,"FORMAT_NONE", SWIG_FromInt((int)FORMAT_NONE)); + PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_FromInt((int)FORMAT_CENTRE_HORIZ)); + PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_FromInt((int)FORMAT_CENTRE_VERT)); + PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_FromInt((int)FORMAT_SIZE_TO_CONTENTS)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_FromInt((int)LINE_ALIGNMENT_HORIZ)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_FromInt((int)LINE_ALIGNMENT_VERT)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_FromInt((int)LINE_ALIGNMENT_NONE)); + PyDict_SetItemString(d,"SHADOW_NONE", SWIG_FromInt((int)SHADOW_NONE)); + PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_FromInt((int)SHADOW_LEFT)); + PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_FromInt((int)SHADOW_RIGHT)); + PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_FromInt((int)OP_CLICK_LEFT)); + PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_FromInt((int)OP_CLICK_RIGHT)); + PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_FromInt((int)OP_DRAG_LEFT)); + PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_FromInt((int)OP_DRAG_RIGHT)); + PyDict_SetItemString(d,"OP_ALL", SWIG_FromInt((int)OP_ALL)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_FromInt((int)ATTACHMENT_MODE_NONE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_FromInt((int)ATTACHMENT_MODE_EDGE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_FromInt((int)ATTACHMENT_MODE_BRANCHING)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_FromInt((int)BRANCHING_ATTACHMENT_NORMAL)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_FromInt((int)BRANCHING_ATTACHMENT_BLOB)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_BOTH)); + PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_FromInt((int)gyCONSTRAINT_LEFT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_FromInt((int)gyCONSTRAINT_RIGHT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_FromInt((int)gyCONSTRAINT_ABOVE)); + PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_FromInt((int)gyCONSTRAINT_BELOW)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_FromInt((int)DIVISION_SIDE_NONE)); + PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_FromInt((int)DIVISION_SIDE_LEFT)); + PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_FromInt((int)DIVISION_SIDE_TOP)); + PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_FromInt((int)DIVISION_SIDE_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_FromInt((int)DIVISION_SIDE_BOTTOM)); // initoglbasicc();