X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dbef2723c6563bd1084486574e4915c4c5587de..28bed70aa9162c430ed20e9d8d9983b2dd63cf10:/wxPython/contrib/ogl/mac/ogl_wrap.cpp diff --git a/wxPython/contrib/ogl/mac/ogl_wrap.cpp b/wxPython/contrib/ogl/mac/ogl_wrap.cpp index 294b11dfcb..363436c147 100644 --- a/wxPython/contrib/ogl/mac/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/mac/ogl_wrap.cpp @@ -121,10 +121,8 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif - /*********************************************************************** * pyrun.swg for wxPython * @@ -137,178 +135,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #include "Python.h" -#include -#include - -#ifdef __cplusplus -#define SWIG_STATIC_INLINE static inline -#else -#define SWIG_STATIC_INLINE static -#endif - -SWIG_STATIC_INLINE long -SPyObj_AsLong(PyObject * obj) -{ - return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); -} - -SWIG_STATIC_INLINE unsigned long -SPyObj_AsUnsignedLong(PyObject * obj) -{ - if (PyLong_Check(obj)) { - return PyLong_AsUnsignedLong(obj); - } else { - long i = PyInt_AsLong(obj); - if ( !PyErr_Occurred() && (i < 0)) { - PyErr_SetString(PyExc_TypeError, "negative value for unsigned type"); - } - return i; - } -} - -#if !defined(_MSC_VER) -SWIG_STATIC_INLINE PyObject* -SPyObj_FromLongLong(long long value) -{ - return (value > (long)(LONG_MAX)) ? - PyLong_FromLongLong(value) : PyInt_FromLong((long)value); -} -#endif - -SWIG_STATIC_INLINE PyObject* -SPyObj_FromUnsignedLong(unsigned long value) -{ - return (value > (unsigned long)(LONG_MAX)) ? - PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); -} - -#if !defined(_MSC_VER) -SWIG_STATIC_INLINE PyObject* -SPyObj_FromUnsignedLongLong(unsigned long long value) -{ - return (value > (unsigned long long)(LONG_MAX)) ? - PyLong_FromUnsignedLongLong(value) : PyInt_FromLong((long)value); -} -#endif - -SWIG_STATIC_INLINE long -SPyObj_AsLongInRange(PyObject * obj, long min_value, long max_value) -{ - long value = SPyObj_AsLong(obj); - if (!PyErr_Occurred()) { - if (value < min_value) { - PyErr_SetString(PyExc_OverflowError,"value is smaller than type minimum"); - } else if (value > max_value) { - PyErr_SetString(PyExc_OverflowError,"value is greater than type maximum"); - } - } - return value; -} - -SWIG_STATIC_INLINE unsigned long -SPyObj_AsUnsignedLongInRange(PyObject *obj, unsigned long max_value) -{ - unsigned long value = SPyObj_AsUnsignedLong(obj); - if (!PyErr_Occurred()) { - if (value > max_value) { - PyErr_SetString(PyExc_OverflowError,"value is greater than type maximum"); - } - } - return value; -} - -SWIG_STATIC_INLINE signed char -SPyObj_AsSignedChar(PyObject *obj) { - return (signed char)SPyObj_AsLongInRange(obj, SCHAR_MIN, SCHAR_MAX); -} - -SWIG_STATIC_INLINE short -SPyObj_AsShort(PyObject *obj) { - return (short)SPyObj_AsLongInRange(obj, SHRT_MIN, SHRT_MAX); -} - -SWIG_STATIC_INLINE int -SPyObj_AsInt(PyObject *obj) { - return SPyObj_AsLongInRange(obj, INT_MIN, INT_MAX); -} - -SWIG_STATIC_INLINE unsigned char -SPyObj_AsUnsignedChar(PyObject *obj) { - return (unsigned char)SPyObj_AsUnsignedLongInRange(obj, UCHAR_MAX); -} - -SWIG_STATIC_INLINE unsigned short -SPyObj_AsUnsignedShort(PyObject *obj) { - return (unsigned short)SPyObj_AsUnsignedLongInRange(obj, USHRT_MAX); -} - -SWIG_STATIC_INLINE unsigned int -SPyObj_AsUnsignedInt(PyObject *obj) { - return SPyObj_AsUnsignedLongInRange(obj, UINT_MAX); -} - -#if !defined(_MSC_VER) -SWIG_STATIC_INLINE long long -SPyObj_AsLongLong(PyObject *obj) { - return PyInt_Check(obj) ? - PyInt_AsLong(obj) : PyLong_AsLongLong(obj); -} - -SWIG_STATIC_INLINE unsigned long long -SPyObj_AsUnsignedLongLong(PyObject *obj) { - return PyLong_Check(obj) ? - PyLong_AsUnsignedLongLong(obj) : SPyObj_AsUnsignedLong(obj); -} -#endif - -SWIG_STATIC_INLINE double -SPyObj_AsDouble(PyObject *obj) { - return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : - (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); -} - -SWIG_STATIC_INLINE float -SPyObj_AsFloat(PyObject *obj) { - double value = SPyObj_AsDouble(obj); - if (!PyErr_Occurred()) { - if (value < FLT_MIN) { - PyErr_SetString(PyExc_OverflowError,"float is smaller than flt_min"); - } else if (value > FLT_MAX) { - PyErr_SetString(PyExc_OverflowError,"float is greater than flt_max"); - } - } - return (float) value; -} - -SWIG_STATIC_INLINE char -SPyObj_AsChar(PyObject *obj) { - char c = (PyString_Check(obj) && PyString_Size(obj) == 1) ? - PyString_AsString(obj)[0] - : (char) SPyObj_AsLongInRange(obj, CHAR_MIN, CHAR_MAX); - if (PyErr_Occurred()) { - PyErr_Clear(); - PyErr_SetString(PyExc_TypeError, "a char is required"); - } - return c; -} - -SWIG_STATIC_INLINE PyObject * -SPyObj_FromChar(char c) { - return PyString_FromStringAndSize(&c,1); -} - -SWIG_STATIC_INLINE PyObject * -SPyObj_FromCharPtr(const char* cptr) { - return cptr ? PyString_FromString(cptr) : Py_BuildValue((char*)""); -} - -SWIG_STATIC_INLINE int -SPyObj_AsBool(PyObject *obj) { - return SPyObj_AsLong/*Long*/(obj) ? 1 : 0; -} - - - #ifdef __cplusplus extern "C" { #endif @@ -357,6 +183,7 @@ typedef struct swig_const_info { #define SWIG_InstallConstants(d, constants) \ SWIG_Python_InstallConstants(d, constants) +typedef double (*py_objasdbl_conv)(PyObject *obj); SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); @@ -368,7 +195,6 @@ SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); - /* Contract support */ #define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else @@ -378,7 +204,6 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #endif - /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_wxOGLConstraint swig_types[0] @@ -389,21 +214,21 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxRealPoint swig_types[5] #define SWIGTYPE_p_wxPyControlPoint swig_types[6] #define SWIGTYPE_p_wxArrowHead swig_types[7] -#define SWIGTYPE_p_wxStringList swig_types[8] -#define SWIGTYPE_p_wxPanel swig_types[9] -#define SWIGTYPE_p_bool swig_types[10] -#define SWIGTYPE_p_wxList swig_types[11] -#define SWIGTYPE_p_wxFont swig_types[12] -#define SWIGTYPE_p_wxScrolledWindow swig_types[13] -#define SWIGTYPE_p_wxWindow swig_types[14] -#define SWIGTYPE_p_double swig_types[15] -#define SWIGTYPE_p_wxPyDivisionShape swig_types[16] -#define SWIGTYPE_p_wxPyDrawnShape swig_types[17] -#define SWIGTYPE_p_wxPyPolygonShape swig_types[18] -#define SWIGTYPE_p_wxBitmap swig_types[19] -#define SWIGTYPE_p_wxObject swig_types[20] -#define SWIGTYPE_p_wxPyBitmapShape swig_types[21] -#define SWIGTYPE_p_wxString swig_types[22] +#define SWIGTYPE_p_char swig_types[8] +#define SWIGTYPE_p_wxStringList swig_types[9] +#define SWIGTYPE_p_wxPanel swig_types[10] +#define SWIGTYPE_p_bool swig_types[11] +#define SWIGTYPE_p_wxList swig_types[12] +#define SWIGTYPE_p_wxFont swig_types[13] +#define SWIGTYPE_p_wxScrolledWindow swig_types[14] +#define SWIGTYPE_p_wxWindow swig_types[15] +#define SWIGTYPE_p_double swig_types[16] +#define SWIGTYPE_p_wxPyDivisionShape swig_types[17] +#define SWIGTYPE_p_wxPyDrawnShape swig_types[18] +#define SWIGTYPE_p_wxPyPolygonShape swig_types[19] +#define SWIGTYPE_p_wxBitmap swig_types[20] +#define SWIGTYPE_p_wxObject swig_types[21] +#define SWIGTYPE_p_wxPyBitmapShape swig_types[22] #define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[23] #define SWIGTYPE_p_wxEvtHandler swig_types[24] #define SWIGTYPE_p_wxPyEllipseShape swig_types[25] @@ -434,6 +259,49 @@ static swig_type_info *swig_types[42]; #define SWIG_name "_ogl" +/* Auxiliar swig macros */ + +#ifdef __cplusplus +#define SWIGSTATICINLINE(a) static inline a +#define SWIGSTATIC(a) static a +#define swig_new_array(type, size) (new type[(size)]) +#define swig_delete_array(cptr) delete[] cptr +#define swig_const_cast(type,a) const_cast(a) +#define swig_static_cast(type,a) static_cast(a) +#define swig_reinterpret_cast(type,a) reinterpret_cast(a) + +#ifdef HAVE_NUMERIC_CAST +#define swig_numeric_cast(type,a) numeric_cast(a) +#else +#define swig_numeric_cast(type,a) static_cast(a) +#endif + +#else /* C case */ + +#define SWIGSTATICINLINE(a) static a +#define SWIGSTATIC(a) static a +#define swig_new_array(type, size) ((type*) malloc((size)*sizeof(type))) +#define swig_delete_array(cptr) free((char*)cptr) +#define swig_const_cast(type,a) (type)(a) +#define swig_static_cast(type,a) (type)(a) +#define swig_reinterpret_cast(type,a) (type)(a) +#define swig_numeric_cast(type,a) (type)(a) + +#endif /* __cplusplus */ + + +#define SWIG_FromSignedChar PyInt_FromLong +#define SWIG_FromUnsignedChar PyInt_FromLong +#define SWIG_FromShort PyInt_FromLong +#define SWIG_FromUnsignedShort PyInt_FromLong +#define SWIG_FromInt PyInt_FromLong +#define SWIG_FromLong PyInt_FromLong +#define SWIG_FromFloat PyFloat_FromDouble +#define SWIG_FromDouble PyFloat_FromDouble +#define SWIG_FromFloat PyFloat_FromDouble +#define SWIG_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "oglhelpers.h" @@ -441,6 +309,102 @@ static swig_type_info *swig_types[42]; static const wxString wxPyEmptyString(wxEmptyString); +SWIGSTATICINLINE(double) +SWIG_AsDouble(PyObject *obj) +{ + if (PyNumber_Check(obj)) + return PyFloat_AsDouble(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } +} + + +SWIGSTATICINLINE(int) +SWIG_CheckDouble(PyObject* obj) +{ + SWIG_AsDouble(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + + +#include + + +SWIGSTATICINLINE(long) +SWIG_CheckLongInRange(long value, const char* type, + long min_value, long max_value) +{ + if (!PyErr_Occurred()) { + if (value < min_value) { + PyObject *err = + PyString_FromFormat("value %ld is less than '%s' minimum %ld", + value, type, min_value); + + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } else if (value > max_value) { + PyObject *err = + PyString_FromFormat("value %ld is greater than '%s' maximum %ld", + value, type, max_value); + PyErr_SetObject(PyExc_OverflowError, err); + Py_DECREF(err); + } + } + return value; +} + + +SWIGSTATICINLINE(long) +SWIG_AsLong(PyObject * obj) +{ + if (PyNumber_Check(obj)) + return PyInt_AsLong(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } +} + + +#if INT_MAX != LONG_MAX +SWIGSTATICINLINE(int) +SWIG_AsInt(PyObject *obj) +{ + return swig_numeric_cast(int, + SWIG_CheckLongInRange(SWIG_AsLong(obj), + "int", INT_MIN, INT_MAX)); +} +#else +#define SWIG_AsInt SWIG_AsLong +#endif + + +SWIGSTATICINLINE(int) +SWIG_CheckInt(PyObject* obj) +{ + SWIG_AsInt(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -474,6 +438,26 @@ void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATICINLINE(bool) +SWIG_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATICINLINE(int) +SWIG_CheckBool(PyObject* obj) +{ + SWIG_AsBool(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + + WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape); PyObject *wxPyShape_GetChildren(wxPyShape *self){ @@ -484,6 +468,19 @@ PyObject *wxPyShape_GetLines(wxPyShape *self){ wxList& list = self->GetLines(); return wxPy_ConvertShapeList(&list); } + +SWIGSTATICINLINE(int) +SWIG_CheckLong(PyObject* obj) +{ + SWIG_AsLong(obj); + if (PyErr_Occurred()) { + PyErr_Clear(); + return 0; + } else { + return 1; + } +} + PyObject *wxPyShape_GetRegions(wxPyShape *self){ wxList& list = self->GetRegions(); return wxPy_ConvertList(&list); @@ -587,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); @@ -603,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(); @@ -626,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(); @@ -634,7 +635,7 @@ PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){ PyList_Append(pyList, pyObj); node = node->GetNext(); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return pyList; } @@ -665,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; } @@ -763,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; @@ -770,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(); @@ -778,7 +800,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) { PyList_Append(pyList, pyObj); node = node->GetNext(); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return pyList; } @@ -826,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; @@ -845,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; @@ -884,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) { @@ -927,12 +951,19 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, Py double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ShapeRegion_SetMinSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinSize(arg2,arg3); @@ -953,12 +984,19 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObj double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ShapeRegion_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -979,12 +1017,19 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, P double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ShapeRegion_SetPosition",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2,arg3); @@ -1005,12 +1050,19 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ShapeRegion_SetProportions",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetProportions",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetProportions(arg2,arg3); @@ -1030,12 +1082,16 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args, wxShapeRegion *arg1 = (wxShapeRegion *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ShapeRegion_SetFormatMode",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFormatMode",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFormatMode(arg2); @@ -1062,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; @@ -1102,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; @@ -1140,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(); @@ -1171,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(); @@ -1179,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; @@ -1201,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); @@ -1239,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); @@ -1277,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); @@ -1315,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); @@ -1348,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(); @@ -1356,7 +1421,7 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1373,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(); @@ -1404,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(); @@ -1435,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(); @@ -1446,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: @@ -1464,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(); { @@ -1475,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; @@ -1492,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(); @@ -1523,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(); @@ -1531,7 +1602,7 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1543,12 +1614,16 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, P wxShapeRegion *arg1 = (wxShapeRegion *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ShapeRegion_SetPenStyle",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenStyle",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPenStyle(arg2); @@ -1575,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; @@ -1613,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(); @@ -1621,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; @@ -1638,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(); @@ -1646,7 +1724,7 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1663,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(); @@ -1671,7 +1750,7 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1687,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(); @@ -1715,11 +1795,26 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObj double arg2 = (double) 0.0 ; double arg3 = (double) 0.0 ; wxAttachmentPoint *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "id",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|idd:new_AttachmentPoint",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AttachmentPoint",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxAttachmentPoint *)new wxAttachmentPoint(arg1,arg2,arg3); @@ -1727,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; @@ -1739,12 +1834,16 @@ static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args, wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:AttachmentPoint_m_id_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_id_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_id = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1764,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 = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -1779,12 +1879,16 @@ static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, P wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:AttachmentPoint_m_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_x_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1804,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 = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1819,12 +1924,16 @@ static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, P wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:AttachmentPoint_m_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_y_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1844,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 = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1874,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(); @@ -1908,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; { @@ -1936,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(); @@ -1963,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); @@ -1989,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(); @@ -2017,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); @@ -2043,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(); @@ -2070,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(); @@ -2096,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(); @@ -2122,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(); @@ -2152,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(); @@ -2184,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2220,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(); @@ -2250,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(); @@ -2280,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(); @@ -2310,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(); @@ -2337,12 +2485,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -2365,12 +2530,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self, int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -2393,12 +2575,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -2419,12 +2618,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *a double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShapeEvtHandler_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -2451,22 +2657,36 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyShapeEvtHandler_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShapeEvtHandler_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2475,7 +2695,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -2493,22 +2715,36 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyShapeEvtHandler_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShapeEvtHandler_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2534,14 +2770,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObjec int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShapeEvtHandler_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -2566,12 +2817,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, Py int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -2594,12 +2862,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -2624,14 +2909,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObje int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShapeEvtHandler_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -2656,12 +2956,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, P int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -2684,12 +3001,29 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyO int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -2714,16 +3048,32 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyOb double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyShapeEvtHandler_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShapeEvtHandler_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -2749,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(); @@ -2779,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(); @@ -2811,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2848,15 +3208,31 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, P PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyShapeEvtHandler_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyShapeEvtHandler_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -2883,13 +3259,31 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *se int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShapeEvtHandler_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -2914,13 +3308,31 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShapeEvtHandler_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -2941,12 +3353,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObje double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -2967,12 +3386,19 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -3005,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(); @@ -3036,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; { @@ -3068,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); @@ -3106,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); @@ -3142,14 +3572,27 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, double temp6 ; double temp7 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL }; arg6 = &temp6; arg7 = &temp7; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odddd:PyShape_GetPerimeterPoint",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetPerimeterPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetPerimeterPoint(arg2,arg3,arg4,arg5,arg6,arg7); @@ -3157,7 +3600,9 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyFloat_FromDouble((double) (*arg6)); resultobj = t_output_helper(resultobj,o); @@ -3182,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(); @@ -3210,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); @@ -3239,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(); @@ -3269,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); @@ -3296,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); @@ -3322,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(); @@ -3330,7 +3786,7 @@ static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -3347,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(); @@ -3355,7 +3812,7 @@ static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -3367,12 +3824,16 @@ static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kw wxPyShape *arg1 = (wxPyShape *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyShape_SetX",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetX",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetX(arg2); @@ -3392,12 +3853,16 @@ static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kw wxPyShape *arg1 = (wxPyShape *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyShape_SetY",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetY",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetY(arg2); @@ -3422,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(); @@ -3450,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); @@ -3476,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(); @@ -3503,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); @@ -3527,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(); @@ -3553,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) SPyObj_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); @@ -3582,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(); @@ -3590,7 +4061,9 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3606,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(); @@ -3632,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(); @@ -3659,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(); @@ -3684,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(); @@ -3712,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); @@ -3737,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(); @@ -3761,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(); @@ -3786,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(); @@ -3794,7 +4277,9 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3810,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(); @@ -3838,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) SPyObj_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(); @@ -3875,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) SPyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3912,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(); @@ -3920,7 +4404,9 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3937,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(); @@ -3945,7 +4432,9 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3962,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(); @@ -3970,7 +4460,9 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -3983,18 +4475,22 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *ar int arg2 = (int) OP_ALL ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sens",(char *) "recursive", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:PyShape_SetSensitivityFilter",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyShape_SetSensitivityFilter",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4020,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(); @@ -4028,7 +4525,7 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -4048,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) SPyObj_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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4086,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) SPyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (bool) SPyObj_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); @@ -4124,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); @@ -4157,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(); @@ -4165,7 +4658,9 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4182,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(); @@ -4190,7 +4686,9 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4208,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) SPyObj_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); @@ -4237,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(); @@ -4245,7 +4743,9 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4258,18 +4758,20 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyO int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode",(char *) "redraw", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:PyShape_SetShadowMode",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetShadowMode",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; if (obj2) { - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4295,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(); @@ -4303,7 +4806,7 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -4321,14 +4824,21 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject int temp4 ; double temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_HitTest",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_HitTest",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->HitTest(arg2,arg3,arg4,arg5); @@ -4336,7 +4846,9 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyInt_FromLong((long) (*arg4)); resultobj = t_output_helper(resultobj,o); @@ -4362,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) SPyObj_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); @@ -4391,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(); @@ -4399,7 +4911,9 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4417,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) SPyObj_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); @@ -4446,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(); @@ -4454,7 +4968,9 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4471,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); @@ -4497,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) SPyObj_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); @@ -4526,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(); @@ -4534,7 +5051,9 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4546,12 +5065,16 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args, wxPyShape *arg1 = (wxPyShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_SetAttachmentMode",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetAttachmentMode",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentMode(arg2); @@ -4576,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(); @@ -4584,7 +5108,7 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -4596,12 +5120,16 @@ static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *k wxPyShape *arg1 = (wxPyShape *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PyShape_SetId",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetId",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -4626,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(); @@ -4634,7 +5163,7 @@ static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -4652,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) { @@ -4696,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) { @@ -4738,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) SPyObj_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); @@ -4767,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(); @@ -4775,7 +5306,9 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -4791,22 +5324,30 @@ static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kw bool arg5 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x1",(char *) "y1",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|O:PyShape_Move",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShape_Move",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; if (obj4) { - { - arg5 = (bool) SPyObj_AsBool(obj4); - if (PyErr_Occurred()) SWIG_fail; - } + arg5 = (bool) SWIG_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4833,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(); @@ -4863,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(); @@ -4893,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(); @@ -4921,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(); @@ -4947,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(); @@ -4977,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(); @@ -5003,18 +5565,23 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject double arg3 ; bool arg4 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "recursive", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|O:PyShape_SetSize",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_SetSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - { - arg4 = (bool) SPyObj_AsBool(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (bool) SWIG_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5036,12 +5603,19 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args, double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_SetAttachmentSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetAttachmentSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentSize(arg2,arg3); @@ -5067,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); @@ -5092,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(); @@ -5117,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(); @@ -5125,7 +5703,9 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5144,14 +5724,37 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "line",(char *) "other",(char *) "attachFrom",(char *) "attachTo",(char *) "positionFrom",(char *) "positionTo", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiii:PyShape_AddLine",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:PyShape_AddLine",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddLine(arg2,arg3,arg4,arg5,arg6,arg7); @@ -5178,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); @@ -5187,7 +5792,7 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -5206,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; @@ -5244,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(); @@ -5252,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; @@ -5269,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(); @@ -5277,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; @@ -5293,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(); @@ -5318,21 +5927,30 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "s",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:PyShape_FormatText",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_FormatText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FormatText(*arg2,(wxString const &)*arg3,arg4); @@ -5361,12 +5979,21 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyO int arg2 ; int arg3 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:PyShape_SetFormatMode",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFormatMode",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFormatMode(arg2,arg3); @@ -5387,12 +6014,18 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO int arg2 = (int) 0 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyShape_GetFormatMode",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetFormatMode",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetFormatMode(arg2); @@ -5400,7 +6033,7 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -5414,12 +6047,14 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "font",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:PyShape_SetFont",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFont",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { wxFont* temp; if (obj1) { @@ -5442,6 +6077,10 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject else arg2 = NULL; } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFont(arg2,arg3); @@ -5462,12 +6101,18 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject int arg2 = (int) 0 ; wxFont *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyShape_GetFont",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetFont",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFont *)(arg1)->GetFont(arg2); @@ -5475,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; @@ -5490,17 +6135,23 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "colour",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:PyShape_SetTextColour",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTextColour((wxString const &)*arg2,arg3); @@ -5529,12 +6180,18 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyO int arg2 = (int) 0 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyShape_GetTextColour",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_GetTextColour",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetTextColour(arg2); @@ -5565,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(); @@ -5573,7 +6231,7 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -5588,17 +6246,23 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:PyShape_SetRegionName",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetRegionName",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRegionName((wxString const &)*arg2,arg3); @@ -5627,12 +6291,16 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_GetRegionName",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionName",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetRegionName(arg2); @@ -5666,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; @@ -5679,7 +6348,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); { if (temp2) delete arg2; @@ -5707,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); @@ -5747,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); @@ -5773,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); @@ -5798,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(); @@ -5822,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(); @@ -5853,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; @@ -5898,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(); @@ -5922,12 +6602,18 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObjec wxPyShape *arg1 = (wxPyShape *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "regionId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyShape_ClearText",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyShape_ClearText",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearText(arg2); @@ -5953,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); @@ -5982,6 +6670,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a double temp3 ; double temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL @@ -5989,10 +6680,22 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a arg3 = &temp3; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iiO:PyShape_GetAttachmentPosition",kwnames,&obj0,&arg2,&arg5,&arg6,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPosition",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg5 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg6 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { - if ((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(); @@ -6001,7 +6704,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6026,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(); @@ -6034,7 +6740,7 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6047,12 +6753,16 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_AttachmentIsValid",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AttachmentIsValid",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AttachmentIsValid(arg2); @@ -6060,7 +6770,9 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6077,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); @@ -6105,6 +6818,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec double temp3 ; double temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL @@ -6112,10 +6828,22 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec arg3 = &temp3; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iiO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&arg2,&arg5,&arg6,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg5 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg6 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { - if ((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(); @@ -6124,7 +6852,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6153,13 +6883,16 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt1",(char *) "pt2",(char *) "nth",(char *) "noArcs",(char *) "line", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiiO:PyShape_CalcSimpleAttachment",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_CalcSimpleAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail; @@ -6168,7 +6901,12 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; } - if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CalcSimpleAttachment((wxRealPoint const &)*arg2,(wxRealPoint const &)*arg3,arg4,arg5,arg6); @@ -6179,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: @@ -6197,14 +6935,18 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args wxRealPoint temp3 ; wxRealPoint temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attachmentPoint",(char *) "pt1",(char *) "pt2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:PyShape_AttachmentSortTest",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_AttachmentSortTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; @@ -6220,7 +6962,9 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6235,22 +6979,29 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObje bool arg4 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "attachment",(char *) "recurse", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iO:PyShape_EraseLinks",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_EraseLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - { - arg4 = (bool) SPyObj_AsBool(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (bool) SWIG_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6274,22 +7025,29 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObjec bool arg4 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "attachment",(char *) "recurse", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iO:PyShape_DrawLinks",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_DrawLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { - { - arg4 = (bool) SPyObj_AsBool(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + arg4 = (bool) SWIG_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6316,17 +7074,28 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "to_move",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:PyShape_MoveLineToNewAttachment",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_MoveLineToNewAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->MoveLineToNewAttachment(*arg2,arg3,arg4,arg5); @@ -6334,7 +7103,9 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6352,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(); @@ -6374,12 +7146,16 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje int arg2 ; wxRealPoint result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBranchingAttachmentRoot(arg2); @@ -6390,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: @@ -6412,6 +7188,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje wxRealPoint temp5 ; wxRealPoint temp6 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -6420,8 +7197,11 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje (char *) "self",(char *) "attachment",(char *) "root",(char *) "neck",(char *) "shoulder1",(char *) "shoulder2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; @@ -6445,7 +7225,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6463,14 +7245,21 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj wxRealPoint temp4 ; wxRealPoint temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attachment",(char *) "n",(char *) "attachmentPoint",(char *) "stemPoint", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { arg4 = &temp4; if ( ! wxRealPoint_helper(obj3, &arg4)) SWIG_fail; @@ -6486,7 +7275,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6499,12 +7290,16 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject * int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_GetAttachmentLineCount",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetAttachmentLineCount",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAttachmentLineCount(arg2); @@ -6512,7 +7307,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6524,12 +7319,16 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *arg wxPyShape *arg1 = (wxPyShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "len", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_SetBranchNeckLength",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchNeckLength",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchNeckLength(arg2); @@ -6554,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(); @@ -6562,7 +7362,7 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6574,12 +7374,16 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *arg wxPyShape *arg1 = (wxPyShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "len", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_SetBranchStemLength",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStemLength",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchStemLength(arg2); @@ -6604,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(); @@ -6612,7 +7417,7 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6624,12 +7429,16 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args, wxPyShape *arg1 = (wxPyShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "len", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_SetBranchSpacing",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchSpacing",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchSpacing(arg2); @@ -6654,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(); @@ -6662,7 +7472,7 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6674,12 +7484,16 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, Py wxPyShape *arg1 = (wxPyShape *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PyShape_SetBranchStyle",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStyle",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchStyle(arg2); @@ -6704,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(); @@ -6712,7 +7527,7 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -6725,12 +7540,16 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "physicalAttachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->PhysicalToLogicalAttachment(arg2); @@ -6738,7 +7557,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6751,12 +7570,16 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "logicalAttachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->LogicalToPhysicalAttachment(arg2); @@ -6764,7 +7587,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -6781,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(); @@ -6789,7 +7613,9 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6808,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); @@ -6817,7 +7645,9 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -6838,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) SPyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6878,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(); @@ -6908,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(); @@ -6934,12 +7769,22 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject * double arg3 ; double arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oddd:PyShape_Rotate",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -6964,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(); @@ -6972,7 +7818,7 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -6984,12 +7830,16 @@ static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObj wxPyShape *arg1 = (wxPyShape *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rotation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyShape_SetRotation",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetRotation",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRotation(arg2); @@ -7013,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(); @@ -7039,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(); @@ -7069,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(); @@ -7098,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(); @@ -7109,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: @@ -7127,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(); @@ -7138,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: @@ -7155,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(); @@ -7181,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(); @@ -7211,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(); @@ -7243,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7279,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(); @@ -7309,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(); @@ -7339,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(); @@ -7369,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(); @@ -7396,12 +8284,29 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args, int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -7424,12 +8329,29 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject * int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -7452,12 +8374,29 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args, int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -7478,12 +8417,19 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObj double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -7510,22 +8456,36 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7534,7 +8494,9 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -7552,22 +8514,36 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7593,14 +8569,29 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, P int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -7625,12 +8616,29 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *ar int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -7653,12 +8661,29 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -7683,14 +8708,29 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -7715,12 +8755,29 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *a int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -7743,12 +8800,29 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *arg int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -7773,16 +8847,32 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -7808,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(); @@ -7838,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(); @@ -7870,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7907,15 +9007,31 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *a PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -7942,13 +9058,31 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObje int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -7973,13 +9107,31 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -8000,12 +9152,19 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args, double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -8026,12 +9185,19 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, Py double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -8086,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; @@ -8109,16 +9276,26 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObj double arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "xoffset",(char *) "yoffset", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd:PseudoMetaFile_Draw",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Draw",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Draw(*arg2,arg3,arg4); @@ -8142,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(); @@ -8168,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(); @@ -8193,12 +9375,19 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyOb double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sx",(char *) "sy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PseudoMetaFile_Scale",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scale(arg2,arg3); @@ -8219,12 +9408,19 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, Py double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PseudoMetaFile_ScaleTo",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_ScaleTo",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ScaleTo(arg2,arg3); @@ -8245,12 +9441,19 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args, double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PseudoMetaFile_Translate",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Translate(arg2,arg3); @@ -8272,12 +9475,22 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyO double arg3 ; double arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oddd:PseudoMetaFile_Rotate",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -8309,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); @@ -8324,7 +9540,9 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -8356,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); @@ -8386,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); @@ -8413,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) SPyObj_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); @@ -8442,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(); @@ -8450,7 +9675,9 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8463,12 +9690,19 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, Py double arg2 ; double arg3 ; PyObject * obj0 = 0 ; - char *kwnames[] = { + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PseudoMetaFile_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -8494,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) { @@ -8535,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(); @@ -8543,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; @@ -8561,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) { @@ -8604,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(); @@ -8612,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; @@ -8624,12 +9862,16 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *arg wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "op", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOutlineOp(arg2); @@ -8654,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(); @@ -8662,7 +9905,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -8679,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(); @@ -8687,7 +9931,9 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -8709,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; @@ -8744,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; @@ -8771,16 +10019,20 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObj wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rect",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:PseudoMetaFile_DrawRoundedRectangle",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -8813,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; @@ -8849,16 +10102,23 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject * wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rect",(char *) "startAngle",(char *) "endAngle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd:PseudoMetaFile_DrawEllipticArc",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + 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); @@ -8885,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; @@ -8916,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; @@ -8950,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; @@ -8988,14 +10251,18 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args, int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; - PyObject * obj2 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points", NULL + (char *) "self",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PseudoMetaFile_DrawLines",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3); @@ -9004,8 +10271,14 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -9017,14 +10290,23 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args wxPoint *arg3 = (wxPoint *) 0 ; int arg4 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL + (char *) "self",(char *) "points",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|i:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } + if (obj2) { + arg4 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4); @@ -9033,8 +10315,14 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -9045,14 +10333,18 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args, int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; - PyObject * obj2 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points", NULL + (char *) "self",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSpline(arg2,arg3); @@ -9061,8 +10353,14 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -9079,7 +10377,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; @@ -9107,7 +10406,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(); @@ -9135,7 +10435,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) { @@ -9155,10 +10456,8 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO arg2 = NULL; } if (obj2) { - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9187,7 +10486,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) { @@ -9205,10 +10505,8 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P arg2 = NULL; } if (obj2) { - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9235,7 +10533,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) { @@ -9284,7 +10583,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; @@ -9315,7 +10615,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; @@ -9339,12 +10640,16 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBackgroundMode(arg2); @@ -9371,11 +10676,21 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyRectangleShape *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_PyRectangleShape",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyRectangleShape",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyRectangleShape *)new wxPyRectangleShape(arg1,arg2); @@ -9383,7 +10698,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; @@ -9403,7 +10718,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; { @@ -9425,12 +10741,16 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCornerRadius(arg2); @@ -9455,7 +10775,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(); @@ -9463,7 +10784,7 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -9479,7 +10800,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(); @@ -9505,10 +10827,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(); @@ -9535,10 +10861,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(); @@ -9567,16 +10897,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9603,10 +10935,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(); @@ -9633,10 +10969,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(); @@ -9663,10 +11003,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(); @@ -9693,10 +11037,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(); @@ -9720,12 +11068,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -9748,12 +11113,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, P int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -9776,12 +11158,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -9802,12 +11201,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *ar double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyRectangleShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -9834,22 +11240,36 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyRectangleShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyRectangleShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9858,7 +11278,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -9876,22 +11298,36 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyRectangleShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyRectangleShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9917,14 +11353,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyRectangleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -9949,12 +11400,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyO int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -9977,12 +11445,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -10007,14 +11492,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObjec int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyRectangleShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -10039,12 +11539,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, Py int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -10067,12 +11584,29 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -10097,16 +11631,32 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObj double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyRectangleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyRectangleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -10132,10 +11682,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(); @@ -10162,10 +11716,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(); @@ -10194,16 +11752,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10231,15 +11791,31 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, Py PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyRectangleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyRectangleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -10266,13 +11842,31 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *sel int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyRectangleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -10297,13 +11891,31 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyRectangleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -10324,12 +11936,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObjec double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -10350,12 +11969,19 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -10388,16 +12014,38 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje wxPyControlPoint *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "the_canvas",(char *) "object",(char *) "size",(char *) "the_xoffset",(char *) "the_yoffset",(char *) "the_type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOdddi:new_PyControlPoint",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_PyControlPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((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_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10406,7 +12054,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; @@ -10426,7 +12074,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; { @@ -10448,12 +12097,16 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject * wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyControlPoint_SetCornerRadius",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCornerRadius(arg2); @@ -10477,7 +12130,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(); @@ -10503,10 +12157,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(); @@ -10533,10 +12191,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(); @@ -10565,16 +12227,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10601,10 +12265,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(); @@ -10631,10 +12299,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(); @@ -10661,10 +12333,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(); @@ -10691,10 +12367,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(); @@ -10718,12 +12398,29 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -10746,12 +12443,29 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyO int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -10774,17 +12488,34 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; @@ -10800,12 +12531,19 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyControlPoint_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -10832,22 +12570,36 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyControlPoint_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyControlPoint_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10856,7 +12608,9 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -10874,22 +12628,36 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject * bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyControlPoint_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyControlPoint_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10915,14 +12683,29 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject * int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyControlPoint_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -10947,12 +12730,29 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -10975,12 +12775,29 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -11005,14 +12822,29 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyControlPoint_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -11037,12 +12869,29 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -11065,12 +12914,29 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -11095,16 +12961,32 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObjec double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyControlPoint_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyControlPoint_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -11130,10 +13012,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(); @@ -11160,10 +13046,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(); @@ -11192,16 +13082,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11229,15 +13121,31 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyControlPoint_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyControlPoint_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -11264,13 +13172,31 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyControlPoint_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -11295,13 +13221,31 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, P int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyControlPoint_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -11322,12 +13266,19 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -11348,12 +13299,19 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *a double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyControlPoint_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -11390,7 +13348,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; @@ -11410,7 +13368,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; { @@ -11437,7 +13396,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(); { @@ -11448,7 +13408,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; @@ -11465,7 +13428,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(); @@ -11497,10 +13461,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(); @@ -11528,7 +13496,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; @@ -11565,7 +13534,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(); @@ -11591,10 +13561,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(); @@ -11621,10 +13595,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(); @@ -11653,16 +13631,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11689,10 +13669,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(); @@ -11719,10 +13703,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(); @@ -11749,10 +13737,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(); @@ -11779,10 +13771,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(); @@ -11806,12 +13802,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject * int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -11834,12 +13847,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -11862,12 +13892,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -11888,12 +13935,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args, double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyBitmapShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -11920,22 +13974,36 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyBitmapShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyBitmapShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11944,7 +14012,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -11962,22 +14032,36 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyBitmapShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyBitmapShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12003,14 +14087,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *a int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyBitmapShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -12035,12 +14134,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -12063,12 +14179,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -12093,14 +14226,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject * int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyBitmapShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -12125,12 +14273,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -12153,12 +14318,29 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -12183,16 +14365,32 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyBitmapShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyBitmapShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -12218,10 +14416,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(); @@ -12248,10 +14450,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(); @@ -12280,16 +14486,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12317,15 +14525,31 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObj PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyBitmapShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyBitmapShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -12352,13 +14576,31 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyBitmapShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -12383,13 +14625,31 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, Py int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyBitmapShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -12410,12 +14670,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject * double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -12436,12 +14703,19 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *ar double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -12478,7 +14752,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; @@ -12498,7 +14772,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; { @@ -12524,7 +14799,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(); @@ -12548,7 +14824,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(); @@ -12581,7 +14858,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; @@ -12613,12 +14891,16 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args, wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawAtAngle(arg2); @@ -12642,16 +14924,23 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *ar wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rect",(char *) "startAngle",(char *) "endAngle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd:PyDrawnShape_DrawEllipticArc",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + 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); @@ -12681,7 +14970,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; @@ -12710,14 +15000,18 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, Py int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; - PyObject * obj2 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points", NULL + (char *) "self",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyDrawnShape_DrawLines",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3); @@ -12726,8 +15020,14 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -12744,7 +15044,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; @@ -12770,14 +15071,23 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args, wxPoint *arg3 = (wxPoint *) 0 ; int arg4 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL + (char *) "self",(char *) "points",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|i:PyDrawnShape_DrawPolygon",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } + if (obj2) { + arg4 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4); @@ -12786,8 +15096,14 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -12804,7 +15120,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; @@ -12831,16 +15148,20 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObjec wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rect",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:PyDrawnShape_DrawRoundedRectangle",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -12861,14 +15182,18 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, P int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; - PyObject * obj2 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "PCOUNT",(char *) "points", NULL + (char *) "self",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyDrawnShape_DrawSpline",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg3 = wxPoint_LIST_helper(obj1, &arg2); + if (arg3 == NULL) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSpline(arg2,arg3); @@ -12877,8 +15202,14 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (arg3) delete [] arg3; + } return resultobj; fail: + { + if (arg3) delete [] arg3; + } return NULL; } @@ -12898,7 +15229,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; @@ -12940,7 +15272,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(); @@ -12948,7 +15281,7 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -12965,7 +15298,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(); { @@ -12976,7 +15310,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; @@ -12993,7 +15327,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(); @@ -13001,7 +15336,7 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -13021,7 +15356,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; @@ -13034,7 +15370,9 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -13056,12 +15394,22 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObj double arg3 ; double arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "theta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oddd:PyDrawnShape_Rotate",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -13088,7 +15436,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; @@ -13119,7 +15468,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; @@ -13143,12 +15493,16 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObj wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDrawnBackgroundMode(arg2); @@ -13176,7 +15530,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) { @@ -13194,10 +15549,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args arg2 = NULL; } if (obj2) { - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13224,7 +15577,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) { @@ -13274,7 +15628,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) { @@ -13294,10 +15649,8 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args, arg2 = NULL; } if (obj2) { - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13325,7 +15678,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; @@ -13350,12 +15704,19 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObje double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sx",(char *) "sy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_Scale",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scale(arg2,arg3); @@ -13381,11 +15742,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) SPyObj_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); @@ -13406,12 +15766,19 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, Py double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_Translate",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Translate(arg2,arg3); @@ -13435,7 +15802,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(); @@ -13461,10 +15829,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(); @@ -13491,10 +15863,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(); @@ -13523,16 +15899,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13559,10 +15937,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(); @@ -13589,10 +15971,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(); @@ -13619,10 +16005,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(); @@ -13649,10 +16039,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(); @@ -13676,12 +16070,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *a int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -13704,12 +16115,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -13732,12 +16160,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject * int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -13758,12 +16203,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args, double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -13790,22 +16242,36 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDrawnShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDrawnShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13814,7 +16280,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -13832,22 +16300,36 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDrawnShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDrawnShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13873,14 +16355,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *ar int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDrawnShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -13905,12 +16402,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -13933,12 +16447,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -13963,14 +16494,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *a int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDrawnShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -13995,12 +16541,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -14023,12 +16586,29 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -14053,16 +16633,32 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyDrawnShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDrawnShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -14088,10 +16684,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(); @@ -14118,10 +16718,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(); @@ -14150,16 +16754,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14187,15 +16793,31 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyDrawnShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDrawnShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -14222,13 +16844,31 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, P int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDrawnShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -14253,13 +16893,31 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyO int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDrawnShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -14280,12 +16938,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *a double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -14306,12 +16971,19 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *arg double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -14339,14 +17011,18 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObjec wxPyShape *arg2 = (wxPyShape *) 0 ; PyObject *arg3 = (PyObject *) 0 ; wxOGLConstraint *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "constraining",(char *) "constrained", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iOO:new_OGLConstraint",kwnames,&arg1,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14374,7 +17050,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(); @@ -14382,7 +17059,9 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14395,12 +17074,19 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args, double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:OGLConstraint_SetSpacing",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_SetSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2,arg3); @@ -14422,12 +17108,19 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb double arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "a",(char *) "b", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:OGLConstraint_Equals",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_Equals",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Equals(arg2,arg3); @@ -14435,7 +17128,9 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14464,7 +17159,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; @@ -14484,7 +17179,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; { @@ -14514,10 +17210,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(); @@ -14545,8 +17244,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); @@ -14571,15 +17272,20 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyO PyObject *arg4 = (PyObject *) 0 ; wxOGLConstraint *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "type",(char *) "constraining",(char *) "constrained", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg4 = obj3; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14605,16 +17311,22 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyOb wxPyShape *arg4 = (wxPyShape *) 0 ; wxOGLConstraint *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "type",(char *) "constraining",(char *) "constrained", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxPyShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxOGLConstraint *)(arg1)->AddConstraint(arg2,arg3,arg4); @@ -14640,7 +17352,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(); @@ -14667,8 +17380,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); @@ -14676,7 +17391,9 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14694,8 +17411,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); @@ -14721,8 +17440,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); @@ -14747,7 +17468,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(); @@ -14774,7 +17496,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); @@ -14799,7 +17522,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); @@ -14823,7 +17547,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(); @@ -14848,7 +17573,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(); @@ -14856,7 +17582,9 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -14874,8 +17602,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); @@ -14899,7 +17629,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(); @@ -14925,10 +17656,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(); @@ -14955,10 +17690,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(); @@ -14987,16 +17726,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15023,10 +17764,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(); @@ -15053,10 +17798,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(); @@ -15083,10 +17832,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(); @@ -15113,10 +17866,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(); @@ -15140,12 +17897,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -15168,12 +17942,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, P int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -15196,12 +17987,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -15222,12 +18030,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *ar double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCompositeShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -15254,22 +18069,36 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyCompositeShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCompositeShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15278,7 +18107,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -15296,22 +18127,36 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyCompositeShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCompositeShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15337,14 +18182,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCompositeShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -15369,12 +18229,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyO int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -15397,12 +18274,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -15427,14 +18321,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObjec int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCompositeShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -15459,12 +18368,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, Py int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -15487,12 +18413,29 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -15517,16 +18460,32 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObj double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyCompositeShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyCompositeShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -15552,10 +18511,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(); @@ -15582,10 +18545,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(); @@ -15614,16 +18581,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15651,15 +18620,31 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, Py PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyCompositeShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyCompositeShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -15686,13 +18671,31 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *sel int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCompositeShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -15717,13 +18720,31 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCompositeShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -15744,12 +18765,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObjec double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -15770,12 +18798,19 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -15802,11 +18837,21 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyDividedShape *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_PyDividedShape",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyDividedShape",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyDividedShape *)new wxPyDividedShape(arg1,arg2); @@ -15814,7 +18859,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; @@ -15834,7 +18879,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; { @@ -15860,7 +18906,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(); @@ -15884,7 +18931,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(); @@ -15908,7 +18956,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(); @@ -15934,10 +18983,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(); @@ -15964,10 +19017,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(); @@ -15996,16 +19053,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16032,10 +19091,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(); @@ -16062,10 +19125,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(); @@ -16092,10 +19159,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(); @@ -16122,10 +19193,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(); @@ -16149,12 +19224,29 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -16177,12 +19269,29 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyO int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -16205,12 +19314,29 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -16231,12 +19357,19 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDividedShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -16263,22 +19396,36 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDividedShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDividedShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16287,7 +19434,9 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -16305,22 +19454,36 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject * bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDividedShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDividedShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16346,14 +19509,29 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject * int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDividedShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -16378,12 +19556,29 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -16406,12 +19601,29 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -16436,14 +19648,29 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDividedShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -16468,12 +19695,29 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -16496,12 +19740,29 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -16526,16 +19787,32 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObjec double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyDividedShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDividedShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -16561,10 +19838,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(); @@ -16591,10 +19872,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(); @@ -16623,16 +19908,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16660,15 +19947,31 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyDividedShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDividedShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -16695,13 +19998,31 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDividedShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -16726,13 +20047,31 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, P int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDividedShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -16753,12 +20092,19 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -16779,12 +20125,19 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *a double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDividedShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -16843,7 +20196,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; { @@ -16866,17 +20220,19 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *ar double arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bottom",(char *) "test", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO:PyDivisionShape_AdjustBottom",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustBottom",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + 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); @@ -16897,17 +20253,19 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args double arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "left",(char *) "test", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO:PyDivisionShape_AdjustLeft",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustLeft",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + 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); @@ -16928,17 +20286,19 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *arg double arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "right",(char *) "test", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO:PyDivisionShape_AdjustRight",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustRight",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + 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); @@ -16959,17 +20319,19 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args, double arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "top",(char *) "test", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO:PyDivisionShape_AdjustTop",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustTop",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + 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); @@ -16989,12 +20351,16 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, Py wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDivisionShape_Divide",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_Divide",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Divide(arg2); @@ -17014,12 +20380,16 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args, wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "side", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDivisionShape_EditEdge",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_EditEdge",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EditEdge(arg2); @@ -17044,7 +20414,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(); @@ -17071,7 +20442,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(); @@ -17079,7 +20451,7 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -17096,7 +20468,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(); @@ -17123,7 +20496,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(); @@ -17154,7 +20528,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(); @@ -17162,7 +20537,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; @@ -17179,7 +20554,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(); @@ -17206,7 +20582,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(); @@ -17233,7 +20610,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(); @@ -17241,7 +20619,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; @@ -17255,17 +20633,22 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject double arg3 ; bool arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "side",(char *) "newPos",(char *) "test", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OidO:PyDivisionShape_ResizeAdjoining",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg4 = (bool) SPyObj_AsBool(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDivisionShape_ResizeAdjoining",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + 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); @@ -17286,12 +20669,19 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args, double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDivisionShape_PopupMenu",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopupMenu(arg2,arg3); @@ -17317,8 +20707,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); @@ -17338,12 +20730,16 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *a wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "side", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyDivisionShape_SetHandleSide",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetHandleSide",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandleSide(arg2); @@ -17369,8 +20765,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); @@ -17397,7 +20795,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; @@ -17436,7 +20835,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) { @@ -17480,8 +20880,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); @@ -17507,8 +20909,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); @@ -17535,7 +20939,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; @@ -17574,7 +20979,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) { @@ -17616,7 +21022,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(); @@ -17642,10 +21049,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(); @@ -17672,10 +21083,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(); @@ -17704,16 +21119,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17740,10 +21157,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(); @@ -17770,10 +21191,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(); @@ -17800,10 +21225,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(); @@ -17830,10 +21259,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(); @@ -17857,12 +21290,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -17885,12 +21335,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, Py int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -17913,12 +21380,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -17939,12 +21423,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *arg double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDivisionShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -17971,22 +21462,36 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject * bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDivisionShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDivisionShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17995,7 +21500,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18013,22 +21520,36 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyDivisionShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyDivisionShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18054,14 +21575,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDivisionShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -18086,12 +21622,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -18114,12 +21667,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -18144,14 +21714,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDivisionShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -18176,12 +21761,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyO int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -18204,12 +21806,29 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -18234,16 +21853,32 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObje double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyDivisionShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyDivisionShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -18269,10 +21904,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(); @@ -18299,10 +21938,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(); @@ -18331,16 +21974,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18368,15 +22013,31 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyDivisionShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyDivisionShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -18403,13 +22064,31 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDivisionShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -18434,13 +22113,31 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyDivisionShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -18461,12 +22158,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -18487,12 +22191,19 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject * double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -18519,11 +22230,21 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyEllipseShape *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_PyEllipseShape",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEllipseShape",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyEllipseShape *)new wxPyEllipseShape(arg1,arg2); @@ -18531,7 +22252,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; @@ -18551,7 +22272,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; { @@ -18579,10 +22301,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(); @@ -18609,10 +22335,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(); @@ -18641,16 +22371,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18677,10 +22409,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(); @@ -18707,10 +22443,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(); @@ -18737,10 +22477,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(); @@ -18767,10 +22511,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(); @@ -18794,12 +22542,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -18822,12 +22587,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyO int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -18850,12 +22632,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -18876,12 +22675,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyEllipseShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -18908,22 +22714,36 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyEllipseShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyEllipseShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18932,7 +22752,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -18950,22 +22772,36 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject * bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyEllipseShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyEllipseShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18991,14 +22827,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject * int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyEllipseShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -19023,12 +22874,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -19051,12 +22919,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -19081,14 +22966,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyEllipseShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -19113,12 +23013,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -19141,12 +23058,29 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -19171,16 +23105,32 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObjec double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyEllipseShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyEllipseShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -19206,10 +23156,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(); @@ -19236,10 +23190,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(); @@ -19268,16 +23226,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19305,15 +23265,31 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyEllipseShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyEllipseShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -19340,13 +23316,31 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyEllipseShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19371,13 +23365,31 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, P int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyEllipseShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19398,12 +23410,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -19424,12 +23443,19 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *a double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -19455,11 +23481,16 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; double arg1 = (double) 0.0 ; wxPyCircleShape *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|d:new_PyCircleShape",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyCircleShape",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyCircleShape *)new wxPyCircleShape(arg1); @@ -19467,7 +23498,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; @@ -19487,7 +23518,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; { @@ -19515,10 +23547,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(); @@ -19545,10 +23581,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(); @@ -19577,16 +23617,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19613,10 +23655,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(); @@ -19643,10 +23689,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(); @@ -19673,10 +23723,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(); @@ -19703,10 +23757,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(); @@ -19730,12 +23788,29 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject * int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -19758,12 +23833,29 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -19786,12 +23878,29 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -19812,12 +23921,19 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args, double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCircleShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -19844,22 +23960,36 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyCircleShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCircleShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19868,7 +23998,9 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -19886,22 +24018,36 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyCircleShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyCircleShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19927,14 +24073,29 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *a int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCircleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -19959,12 +24120,29 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -19987,12 +24165,29 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -20017,14 +24212,29 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject * int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCircleShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -20049,12 +24259,29 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -20077,12 +24304,29 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -20107,16 +24351,32 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyCircleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyCircleShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -20142,10 +24402,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(); @@ -20172,10 +24436,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(); @@ -20204,16 +24472,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20241,15 +24511,31 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObj PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyCircleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyCircleShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -20276,13 +24562,31 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCircleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -20307,13 +24611,31 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, Py int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyCircleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -20334,12 +24656,19 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject * double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -20360,12 +24689,19 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *ar double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyCircleShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -20399,13 +24735,34 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k long arg7 = (long) -1 ; wxArrowHead *result; bool temp5 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "type",(char *) "end",(char *) "size",(char *) "dist",(char *) "name",(char *) "mf",(char *) "arrowId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiddOOl:new_ArrowHead",kwnames,&arg1,&arg2,&arg3,&arg4,&obj4,&obj5,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOOO:new_ArrowHead",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { arg5 = wxString_in_helper(obj4); @@ -20414,7 +24771,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_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20449,7 +24811,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; @@ -20474,7 +24837,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(); @@ -20482,7 +24846,7 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -20499,7 +24863,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(); @@ -20507,7 +24872,7 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -20519,12 +24884,16 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyO wxArrowHead *arg1 = (wxArrowHead *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ArrowHead_SetPosition",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetPosition",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -20549,7 +24918,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(); @@ -20557,7 +24927,7 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20574,7 +24944,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(); @@ -20582,7 +24953,7 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20599,7 +24970,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(); @@ -20607,7 +24979,7 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20624,7 +24996,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(); @@ -20632,7 +25005,7 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20649,7 +25022,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(); @@ -20675,12 +25049,16 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyOb wxArrowHead *arg1 = (wxArrowHead *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:ArrowHead_SetXOffset",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetXOffset",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetXOffset(arg2); @@ -20700,12 +25078,16 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyOb wxArrowHead *arg1 = (wxArrowHead *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:ArrowHead_SetYOffset",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetYOffset",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetYOffset(arg2); @@ -20730,7 +25112,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(); @@ -20757,7 +25140,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(); @@ -20765,7 +25149,7 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromLong((long)result); return resultobj; fail: return NULL; @@ -20782,7 +25166,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(); @@ -20790,7 +25175,7 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -20807,7 +25192,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(); @@ -20815,7 +25201,7 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20827,12 +25213,16 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObjec wxArrowHead *arg1 = (wxArrowHead *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "size", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:ArrowHead_SetSize",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2); @@ -20852,12 +25242,16 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyOb wxArrowHead *arg1 = (wxArrowHead *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sp", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:ArrowHead_SetSpacing",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSpacing",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2); @@ -20894,7 +25288,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; @@ -20914,7 +25308,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; { @@ -20944,14 +25339,34 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb long arg8 = (long) -1 ; bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "type",(char *) "end",(char *) "arrowSize",(char *) "xOffset",(char *) "name",(char *) "mf",(char *) "arrowId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iddOOl:PyLineShape_AddArrow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&arg8)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:PyLineShape_AddArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -20960,7 +25375,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_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -20993,14 +25413,19 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *arg PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "arrow",(char *) "referenceList",(char *) "end", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOi:PyLineShape_AddArrowOrdered",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyLineShape_AddArrowOrdered",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxArrowHead, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg3 = obj2; + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyLineShape_AddArrowOrdered(arg1,arg2,arg3,arg4); @@ -21028,7 +25453,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; @@ -21041,7 +25467,9 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp2) delete arg2; @@ -21061,12 +25489,18 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObjec wxPyLineShape *arg1 = (wxPyLineShape *) 0 ; int arg2 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyLineShape_ClearArrowsAtPosition",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyLineShape_ClearArrowsAtPosition",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearArrowsAtPosition(arg2); @@ -21091,22 +25525,28 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "arrow",(char *) "xOffset",(char *) "proportionalOffset", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdO:PyLineShape_DrawArrow",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg5 = (bool) SPyObj_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); @@ -21127,12 +25567,16 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "arrowId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteArrowHead(arg2); @@ -21140,7 +25584,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21155,13 +25601,17 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg bool result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -21174,7 +25624,9 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } { if (temp3) delete arg3; @@ -21199,7 +25651,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(); @@ -21207,7 +25660,9 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21225,10 +25680,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(); @@ -21254,17 +25713,28 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, Py PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "region",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:PyLineShape_DrawRegion",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRegion(*arg2,arg3,arg4,arg5); @@ -21289,17 +25759,28 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, P PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "region",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:PyLineShape_EraseRegion",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_EraseRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EraseRegion(*arg2,arg3,arg4,arg5); @@ -21320,12 +25801,16 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *arg long arg2 ; wxArrowHead *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "arrowId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PyLineShape_FindArrowHeadId",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_FindArrowHeadId",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxArrowHead *)(arg1)->FindArrowHead(arg2); @@ -21350,13 +25835,17 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args, wxArrowHead *result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyLineShape_FindArrowHead",kwnames,&obj0,&arg2,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -21407,7 +25896,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); @@ -21445,12 +25935,19 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar double arg3 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyLineShape_FindLinePosition",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindLinePosition",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->FindLinePosition(arg2,arg3); @@ -21458,7 +25955,7 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -21475,7 +25972,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(); @@ -21483,7 +25981,7 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -21509,12 +26007,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) SPyObj_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); @@ -21547,7 +26045,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(); @@ -21555,7 +26054,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -21572,7 +26071,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(); @@ -21580,7 +26080,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -21608,7 +26108,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); @@ -21649,7 +26150,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(); @@ -21675,14 +26177,18 @@ static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *self, PyObject *ar double temp3 ; double temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position", NULL }; arg3 = &temp3; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyLineShape_GetLabelPosition",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetLabelPosition",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetLabelPosition(arg2,arg3,arg4); @@ -21717,8 +26223,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); @@ -21726,7 +26234,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; @@ -21743,7 +26251,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(); @@ -21769,7 +26278,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(); @@ -21795,8 +26305,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); @@ -21823,8 +26335,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); @@ -21832,7 +26346,9 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21849,7 +26365,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(); @@ -21857,7 +26374,9 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -21869,12 +26388,16 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObjec wxPyLineShape *arg1 = (wxPyLineShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeLineControlPoints(arg2); @@ -21899,7 +26422,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); @@ -21914,17 +26438,49 @@ 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 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "fromAttach", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentFrom(arg2); @@ -21945,12 +26501,19 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "fromAttach",(char *) "toAttach", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyLineShape_SetAttachments",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAttachments",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachments(arg2,arg3); @@ -21970,12 +26533,16 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *arg wxPyLineShape *arg1 = (wxPyLineShape *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "toAttach", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyLineShape_SetAttachmentTo",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentTo",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentTo(arg2); @@ -21998,12 +26565,25 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObj double arg4 ; double arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odddd:PyLineShape_SetEnds",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_SetEnds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEnds(arg2,arg3,arg4,arg5); @@ -22029,8 +26609,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); @@ -22056,11 +26638,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) SPyObj_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); @@ -22086,11 +26667,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) SPyObj_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); @@ -22116,8 +26696,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); @@ -22143,9 +26725,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(); @@ -22170,7 +26754,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(); @@ -22198,15 +26783,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) SPyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg3 = (bool) SPyObj_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); @@ -22228,16 +26810,18 @@ static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *ar int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "isEnd",(char *) "alignType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyLineShape_SetAlignmentType",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentType",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignmentType(arg2,arg3); @@ -22264,11 +26848,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) SPyObj_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); @@ -22276,7 +26859,9 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22295,11 +26880,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) SPyObj_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); @@ -22307,7 +26891,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -22324,7 +26908,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(); @@ -22332,7 +26917,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -22349,7 +26934,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(); @@ -22357,7 +26943,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -22375,10 +26961,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(); @@ -22405,10 +26995,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(); @@ -22437,16 +27031,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22473,10 +27069,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(); @@ -22503,10 +27103,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(); @@ -22533,10 +27137,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(); @@ -22563,10 +27171,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(); @@ -22590,12 +27202,29 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *ar int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -22618,12 +27247,29 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -22646,12 +27292,29 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *a int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -22672,12 +27335,19 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, P double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyLineShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -22704,22 +27374,36 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyLineShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22728,7 +27412,9 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -22746,22 +27432,36 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22787,14 +27487,29 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *arg int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyLineShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -22819,12 +27534,29 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -22847,12 +27579,29 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject * int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -22877,14 +27626,29 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *ar int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyLineShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -22909,12 +27673,29 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -22937,12 +27718,29 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -22967,16 +27765,32 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject * double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyLineShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyLineShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -23002,10 +27816,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(); @@ -23032,10 +27850,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(); @@ -23064,16 +27886,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23101,15 +27925,31 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObjec PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyLineShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyLineShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -23136,13 +27976,31 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, Py int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyLineShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -23167,13 +28025,31 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyOb int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyLineShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -23194,12 +28070,19 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *ar double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyLineShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -23220,12 +28103,19 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyLineShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -23262,7 +28152,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; @@ -23282,7 +28172,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; { @@ -23311,7 +28202,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(); @@ -23332,12 +28224,18 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject * wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyPolygonShape_AddPolygonPoint",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyPolygonShape_AddPolygonPoint",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddPolygonPoint(arg2); @@ -23361,7 +28259,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(); @@ -23381,12 +28280,18 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObjec wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:PyPolygonShape_DeletePolygonPoint",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyPolygonShape_DeletePolygonPoint",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeletePolygonPoint(arg2); @@ -23411,7 +28316,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); @@ -23436,7 +28342,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); @@ -23461,7 +28368,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(); @@ -23469,7 +28377,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -23486,7 +28394,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(); @@ -23494,7 +28403,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -23506,12 +28415,16 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOriginalWidth(arg2); @@ -23531,12 +28444,16 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOriginalHeight(arg2); @@ -23560,7 +28477,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(); @@ -23586,10 +28504,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(); @@ -23616,10 +28538,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(); @@ -23648,16 +28574,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23684,10 +28612,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(); @@ -23714,10 +28646,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(); @@ -23744,10 +28680,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(); @@ -23774,10 +28714,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(); @@ -23801,12 +28745,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -23829,12 +28790,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyO int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -23857,12 +28835,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -23883,12 +28878,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyPolygonShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -23915,22 +28917,36 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyPolygonShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyPolygonShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23939,7 +28955,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -23957,22 +28975,36 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject * bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyPolygonShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyPolygonShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23998,14 +29030,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject * int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyPolygonShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -24030,12 +29077,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObj int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -24058,12 +29122,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -24088,14 +29169,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyPolygonShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -24120,12 +29216,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyOb int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -24148,12 +29261,29 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -24178,16 +29308,32 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObjec double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyPolygonShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyPolygonShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -24213,10 +29359,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(); @@ -24243,10 +29393,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(); @@ -24275,16 +29429,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24312,15 +29468,31 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyPolygonShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyPolygonShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -24347,13 +29519,31 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self, int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyPolygonShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24378,13 +29568,31 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, P int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyPolygonShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24405,12 +29613,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -24431,12 +29646,19 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *a double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -24463,11 +29685,21 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyTextShape *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_PyTextShape",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyTextShape",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (double) SWIG_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyTextShape *)new wxPyTextShape(arg1,arg2); @@ -24475,7 +29707,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; @@ -24495,7 +29727,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; { @@ -24521,7 +29754,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(); @@ -24547,10 +29781,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(); @@ -24577,10 +29815,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(); @@ -24609,16 +29851,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24645,10 +29889,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(); @@ -24675,10 +29923,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(); @@ -24705,10 +29957,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(); @@ -24735,10 +29991,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(); @@ -24762,12 +30022,29 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *ar int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -24790,12 +30067,29 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObje int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -24818,12 +30112,29 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *a int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -24844,12 +30155,19 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, P double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyTextShape_base_OnSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -24876,22 +30194,36 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyTextShape_base_OnMovePre",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyTextShape_base_OnMovePre",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24900,7 +30232,9 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -24918,22 +30252,36 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg bool arg7 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "old_x",(char *) "old_y",(char *) "display", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd|O:PyTextShape_base_OnMovePost",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyTextShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; if (obj6) { - { - arg7 = (bool) SPyObj_AsBool(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + arg7 = (bool) SWIG_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24959,14 +30307,29 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *arg int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyTextShape_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -24991,12 +30354,29 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -25019,12 +30399,29 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject * int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -25049,14 +30446,29 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *ar int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyTextShape_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -25081,12 +30493,29 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObjec int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -25109,12 +30538,29 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|ii:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -25139,16 +30585,32 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject * double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:PyTextShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyTextShape_base_OnDrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -25174,10 +30636,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(); @@ -25204,10 +30670,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(); @@ -25236,16 +30706,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) SPyObj_AsBool(obj2); - if (PyErr_Occurred()) SWIG_fail; - } + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25273,15 +30745,31 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObjec PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd|ii:PyTextShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg3 = (bool) SPyObj_AsBool(obj2); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:PyTextShape_base_OnSizingDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (bool) SWIG_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + arg7 = (int) SWIG_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -25308,13 +30796,31 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, Py int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyTextShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -25339,13 +30845,31 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyOb int arg6 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "x",(char *) "y",(char *) "keys",(char *) "attachment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|ii:PyTextShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + arg6 = (int) SWIG_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -25366,12 +30890,19 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *ar double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyTextShape_base_OnBeginSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -25392,12 +30923,19 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PyTextShape_base_OnEndSize",kwnames,&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -25456,10 +30994,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(); @@ -25486,10 +31027,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(); @@ -25514,7 +31059,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(); @@ -25539,16 +31085,32 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObj double arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdddd:Diagram_DrawOutline",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Diagram_DrawOutline",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; } + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (double) SWIG_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + arg6 = (double) SWIG_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -25569,12 +31131,16 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObjec long arg2 ; wxPyShape *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Diagram_FindShape",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_FindShape",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindShape(arg2); @@ -25601,7 +31167,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(); @@ -25628,7 +31195,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(); @@ -25636,7 +31204,7 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -25653,7 +31221,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(); @@ -25661,7 +31230,7 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_FromDouble((double)result); return resultobj; fail: return NULL; @@ -25678,7 +31247,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(); @@ -25686,7 +31256,7 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -25703,7 +31273,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); @@ -25728,7 +31299,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(); @@ -25736,7 +31308,9 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -25753,7 +31327,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(); @@ -25761,7 +31336,9 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -25779,8 +31356,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); @@ -25806,10 +31385,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(); @@ -25836,10 +31419,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(); @@ -25864,7 +31451,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(); @@ -25890,8 +31478,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); @@ -25917,8 +31507,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); @@ -25938,12 +31530,16 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, Py wxDiagram *arg1 = (wxDiagram *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spacing", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Diagram_SetGridSpacing",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetGridSpacing",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetGridSpacing(arg2); @@ -25963,12 +31559,16 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args, wxDiagram *arg1 = (wxDiagram *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Diagram_SetMouseTolerance",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetMouseTolerance",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMouseTolerance(arg2); @@ -25994,11 +31594,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) SPyObj_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); @@ -26024,11 +31623,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) SPyObj_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); @@ -26054,11 +31652,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) SPyObj_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); @@ -26088,7 +31685,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; @@ -26144,16 +31742,23 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec wxSize temp4 ; bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiOOlO:new_PyShapeCanvas",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_PyShapeCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { @@ -26167,6 +31772,10 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + arg5 = (long) SWIG_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -26211,7 +31820,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; { @@ -26241,10 +31851,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(); @@ -26271,6 +31884,8 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P wxPyShape *result; int temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { @@ -26278,13 +31893,20 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P }; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; if (obj3) { - if ((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(); @@ -26316,13 +31938,23 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO wxPyShape *result; int temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x1",(char *) "y",(char *) "op", NULL }; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oddi:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&arg2,&arg3,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg5 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindFirstSensitiveShape(arg2,arg3,arg4,arg5); @@ -26353,7 +31985,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(); @@ -26380,7 +32013,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(); @@ -26388,7 +32022,9 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -26406,8 +32042,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); @@ -26429,12 +32067,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObje double arg3 ; int arg4 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4); @@ -26456,12 +32106,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObj double arg3 ; int arg4 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4); @@ -26483,12 +32145,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject double arg3 ; int arg4 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4); @@ -26510,12 +32184,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObjec double arg3 ; int arg4 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4); @@ -26539,14 +32225,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *a int arg5 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|i:PyShapeCanvas_base_OnDragLeft",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -26572,14 +32268,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject * int arg5 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "draw",(char *) "x",(char *) "y",(char *) "keys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOdd|i:PyShapeCanvas_base_OnDragRight",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = (bool) SPyObj_AsBool(obj1); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (double) SWIG_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -26603,12 +32309,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject * double arg3 ; int arg4 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4); @@ -26630,12 +32348,24 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject double arg3 ; int arg4 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "keys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd|i:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (double) SWIG_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (double) SWIG_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4); @@ -26661,10 +32391,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(); @@ -26691,8 +32425,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); @@ -26718,8 +32454,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); @@ -26749,7 +32487,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; @@ -27536,6 +33275,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 }, @@ -27716,6 +33456,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)); } @@ -27737,6 +33480,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)); } @@ -27815,6 +33561,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)); } @@ -28220,6 +33969,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)); } @@ -28454,6 +34206,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)); } @@ -28583,47 +34338,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_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0},{"_p_wxStringList"},{0}}; -static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; -static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0},{"_p_bool"},{0}}; -static swig_type_info _swigt__p_wxList[] = {{"_p_wxList", 0, "wxList *", 0},{"_p_wxList"},{0}}; -static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; -static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow},{0}}; -static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; -static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}}; -static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0},{"_p_wxPyDivisionShape"},{0}}; -static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0},{"_p_wxPyDrawnShape"},{0}}; -static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0},{"_p_wxPyPolygonShape"},{0}}; -static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject},{"_p_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, @@ -28634,6 +34389,7 @@ _swigt__p_wxDC, _swigt__p_wxRealPoint, _swigt__p_wxPyControlPoint, _swigt__p_wxArrowHead, +_swigt__p_char, _swigt__p_wxStringList, _swigt__p_wxPanel, _swigt__p_bool, @@ -28648,7 +34404,6 @@ _swigt__p_wxPyPolygonShape, _swigt__p_wxBitmap, _swigt__p_wxObject, _swigt__p_wxPyBitmapShape, -_swigt__p_wxString, _swigt__p_wxPyShapeEvtHandler, _swigt__p_wxEvtHandler, _swigt__p_wxPyEllipseShape, @@ -28674,70 +34429,6 @@ _swigt__p_wxPyDividedShape, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"oglMETAFLAGS_OUTLINE", (long) oglMETAFLAGS_OUTLINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"oglMETAFLAGS_ATTACHMENTS", (long) oglMETAFLAGS_ATTACHMENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KEY_SHIFT", (long) KEY_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KEY_CTRL", (long) KEY_CTRL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_NONE", (long) ARROW_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_END", (long) ARROW_END, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_BOTH", (long) ARROW_BOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_MIDDLE", (long) ARROW_MIDDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_START", (long) ARROW_START, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_HOLLOW_CIRCLE", (long) ARROW_HOLLOW_CIRCLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_FILLED_CIRCLE", (long) ARROW_FILLED_CIRCLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_ARROW", (long) ARROW_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_SINGLE_OBLIQUE", (long) ARROW_SINGLE_OBLIQUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_DOUBLE_OBLIQUE", (long) ARROW_DOUBLE_OBLIQUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_METAFILE", (long) ARROW_METAFILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_POSITION_END", (long) ARROW_POSITION_END, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ARROW_POSITION_START", (long) ARROW_POSITION_START, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONTROL_POINT_VERTICAL", (long) CONTROL_POINT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONTROL_POINT_HORIZONTAL", (long) CONTROL_POINT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONTROL_POINT_DIAGONAL", (long) CONTROL_POINT_DIAGONAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONTROL_POINT_ENDPOINT_TO", (long) CONTROL_POINT_ENDPOINT_TO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONTROL_POINT_ENDPOINT_FROM", (long) CONTROL_POINT_ENDPOINT_FROM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONTROL_POINT_LINE", (long) CONTROL_POINT_LINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FORMAT_NONE", (long) FORMAT_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FORMAT_CENTRE_HORIZ", (long) FORMAT_CENTRE_HORIZ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FORMAT_CENTRE_VERT", (long) FORMAT_CENTRE_VERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FORMAT_SIZE_TO_CONTENTS", (long) FORMAT_SIZE_TO_CONTENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LINE_ALIGNMENT_HORIZ", (long) LINE_ALIGNMENT_HORIZ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LINE_ALIGNMENT_VERT", (long) LINE_ALIGNMENT_VERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LINE_ALIGNMENT_TO_NEXT_HANDLE", (long) LINE_ALIGNMENT_TO_NEXT_HANDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LINE_ALIGNMENT_NONE", (long) LINE_ALIGNMENT_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHADOW_NONE", (long) SHADOW_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHADOW_LEFT", (long) SHADOW_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHADOW_RIGHT", (long) SHADOW_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OP_CLICK_LEFT", (long) OP_CLICK_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OP_CLICK_RIGHT", (long) OP_CLICK_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OP_DRAG_LEFT", (long) OP_DRAG_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OP_DRAG_RIGHT", (long) OP_DRAG_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OP_ALL", (long) OP_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ATTACHMENT_MODE_NONE", (long) ATTACHMENT_MODE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ATTACHMENT_MODE_EDGE", (long) ATTACHMENT_MODE_EDGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ATTACHMENT_MODE_BRANCHING", (long) ATTACHMENT_MODE_BRANCHING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BRANCHING_ATTACHMENT_NORMAL", (long) BRANCHING_ATTACHMENT_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BRANCHING_ATTACHMENT_BLOB", (long) BRANCHING_ATTACHMENT_BLOB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_CENTRED_VERTICALLY", (long) gyCONSTRAINT_CENTRED_VERTICALLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_CENTRED_HORIZONTALLY", (long) gyCONSTRAINT_CENTRED_HORIZONTALLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_CENTRED_BOTH", (long) gyCONSTRAINT_CENTRED_BOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_LEFT_OF", (long) gyCONSTRAINT_LEFT_OF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_RIGHT_OF", (long) gyCONSTRAINT_RIGHT_OF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_ABOVE", (long) gyCONSTRAINT_ABOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_BELOW", (long) gyCONSTRAINT_BELOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_ALIGNED_TOP", (long) gyCONSTRAINT_ALIGNED_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_ALIGNED_BOTTOM", (long) gyCONSTRAINT_ALIGNED_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_ALIGNED_LEFT", (long) gyCONSTRAINT_ALIGNED_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_ALIGNED_RIGHT", (long) gyCONSTRAINT_ALIGNED_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_MIDALIGNED_TOP", (long) gyCONSTRAINT_MIDALIGNED_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_MIDALIGNED_BOTTOM", (long) gyCONSTRAINT_MIDALIGNED_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_MIDALIGNED_LEFT", (long) gyCONSTRAINT_MIDALIGNED_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"gyCONSTRAINT_MIDALIGNED_RIGHT", (long) gyCONSTRAINT_MIDALIGNED_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIVISION_SIDE_NONE", (long) DIVISION_SIDE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIVISION_SIDE_LEFT", (long) DIVISION_SIDE_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIVISION_SIDE_TOP", (long) DIVISION_SIDE_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIVISION_SIDE_RIGHT", (long) DIVISION_SIDE_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIVISION_SIDE_BOTTOM", (long) DIVISION_SIDE_BOTTOM, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -28764,6 +34455,70 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_FromInt((int)oglMETAFLAGS_OUTLINE)); + PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_FromInt((int)oglMETAFLAGS_ATTACHMENTS)); + PyDict_SetItemString(d,"KEY_SHIFT", SWIG_FromInt((int)KEY_SHIFT)); + PyDict_SetItemString(d,"KEY_CTRL", SWIG_FromInt((int)KEY_CTRL)); + PyDict_SetItemString(d,"ARROW_NONE", SWIG_FromInt((int)ARROW_NONE)); + PyDict_SetItemString(d,"ARROW_END", SWIG_FromInt((int)ARROW_END)); + PyDict_SetItemString(d,"ARROW_BOTH", SWIG_FromInt((int)ARROW_BOTH)); + PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_FromInt((int)ARROW_MIDDLE)); + PyDict_SetItemString(d,"ARROW_START", SWIG_FromInt((int)ARROW_START)); + PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_FromInt((int)ARROW_HOLLOW_CIRCLE)); + PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_FromInt((int)ARROW_FILLED_CIRCLE)); + PyDict_SetItemString(d,"ARROW_ARROW", SWIG_FromInt((int)ARROW_ARROW)); + PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_FromInt((int)ARROW_SINGLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_FromInt((int)ARROW_DOUBLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_FromInt((int)ARROW_METAFILE)); + PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_FromInt((int)ARROW_POSITION_END)); + PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_FromInt((int)ARROW_POSITION_START)); + PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_FromInt((int)CONTROL_POINT_VERTICAL)); + PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_FromInt((int)CONTROL_POINT_HORIZONTAL)); + PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_FromInt((int)CONTROL_POINT_DIAGONAL)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_TO)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_FROM)); + PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_FromInt((int)CONTROL_POINT_LINE)); + PyDict_SetItemString(d,"FORMAT_NONE", SWIG_FromInt((int)FORMAT_NONE)); + PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_FromInt((int)FORMAT_CENTRE_HORIZ)); + PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_FromInt((int)FORMAT_CENTRE_VERT)); + PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_FromInt((int)FORMAT_SIZE_TO_CONTENTS)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_FromInt((int)LINE_ALIGNMENT_HORIZ)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_FromInt((int)LINE_ALIGNMENT_VERT)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_FromInt((int)LINE_ALIGNMENT_NONE)); + PyDict_SetItemString(d,"SHADOW_NONE", SWIG_FromInt((int)SHADOW_NONE)); + PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_FromInt((int)SHADOW_LEFT)); + PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_FromInt((int)SHADOW_RIGHT)); + PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_FromInt((int)OP_CLICK_LEFT)); + PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_FromInt((int)OP_CLICK_RIGHT)); + PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_FromInt((int)OP_DRAG_LEFT)); + PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_FromInt((int)OP_DRAG_RIGHT)); + PyDict_SetItemString(d,"OP_ALL", SWIG_FromInt((int)OP_ALL)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_FromInt((int)ATTACHMENT_MODE_NONE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_FromInt((int)ATTACHMENT_MODE_EDGE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_FromInt((int)ATTACHMENT_MODE_BRANCHING)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_FromInt((int)BRANCHING_ATTACHMENT_NORMAL)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_FromInt((int)BRANCHING_ATTACHMENT_BLOB)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_BOTH)); + PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_FromInt((int)gyCONSTRAINT_LEFT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_FromInt((int)gyCONSTRAINT_RIGHT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_FromInt((int)gyCONSTRAINT_ABOVE)); + PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_FromInt((int)gyCONSTRAINT_BELOW)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_FromInt((int)DIVISION_SIDE_NONE)); + PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_FromInt((int)DIVISION_SIDE_LEFT)); + PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_FromInt((int)DIVISION_SIDE_TOP)); + PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_FromInt((int)DIVISION_SIDE_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_FromInt((int)DIVISION_SIDE_BOTTOM)); // initoglbasicc();