From 8edf1c75f0667d3568e224910fa858cf05234942 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 31 Jan 2004 03:29:15 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/mac/gizmos_wrap.cpp | 859 +- wxPython/contrib/gizmos/msw/gizmos_wrap.cpp | 859 +- .../contrib/glcanvas/mac/glcanvas_wrap.cpp | 338 +- .../contrib/glcanvas/msw/glcanvas_wrap.cpp | 338 +- wxPython/contrib/iewin/iewin_wrap.cpp | 364 +- wxPython/contrib/ogl/mac/ogl_wrap.cpp | 8373 +++++++++++++++-- wxPython/contrib/ogl/msw/ogl_wrap.cpp | 8373 +++++++++++++++-- wxPython/contrib/stc/stc_wrap.cpp | 2 +- wxPython/contrib/xrc/xrc_wrap.cpp | 14 +- wxPython/demo/Main.py | 31 +- wxPython/src/mac/calendar_wrap.cpp | 438 +- wxPython/src/mac/controls.py | 18 +- wxPython/src/mac/controls_wrap.cpp | 4365 ++++++--- wxPython/src/mac/core_wrap.cpp | 5865 ++++++++---- wxPython/src/mac/gdi.py | 91 +- wxPython/src/mac/gdi_wrap.cpp | 4673 +++++---- wxPython/src/mac/grid_wrap.cpp | 2527 +++-- wxPython/src/mac/html_wrap.cpp | 1132 ++- wxPython/src/mac/misc_wrap.cpp | 3643 ++++--- wxPython/src/mac/windows.py | 9 +- wxPython/src/mac/windows_wrap.cpp | 2898 ++++-- wxPython/src/mac/wizard_wrap.cpp | 451 +- wxPython/src/msw/calendar_wrap.cpp | 438 +- wxPython/src/msw/controls.py | 18 +- wxPython/src/msw/controls_wrap.cpp | 4408 ++++++--- wxPython/src/msw/core_wrap.cpp | 5880 ++++++++---- wxPython/src/msw/gdi.py | 91 +- wxPython/src/msw/gdi_wrap.cpp | 4778 ++++++---- wxPython/src/msw/grid_wrap.cpp | 2527 +++-- wxPython/src/msw/html_wrap.cpp | 1132 ++- wxPython/src/msw/misc.py | 2 +- wxPython/src/msw/misc_wrap.cpp | 3643 ++++--- wxPython/src/msw/windows.py | 11 +- wxPython/src/msw/windows_wrap.cpp | 2923 ++++-- wxPython/src/msw/wizard_wrap.cpp | 451 +- 35 files changed, 53113 insertions(+), 18850 deletions(-) diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp index 238ea0f324..5a07e2790f 100644 --- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -390,10 +239,10 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPyTreeListCtrl swig_types[6] #define SWIGTYPE_p_wxImageList swig_types[7] #define SWIGTYPE_p_wxScrollBar swig_types[8] -#define SWIGTYPE_p_wxDynamicSashWindow swig_types[9] -#define SWIGTYPE_p_wxScrolledWindow swig_types[10] -#define SWIGTYPE_p_wxSplitterWindow swig_types[11] -#define SWIGTYPE_p_wxWindow swig_types[12] +#define SWIGTYPE_p_wxScrolledWindow swig_types[9] +#define SWIGTYPE_p_wxSplitterWindow swig_types[10] +#define SWIGTYPE_p_wxWindow swig_types[11] +#define SWIGTYPE_p_wxDynamicSashWindow swig_types[12] #define SWIGTYPE_p_wxPyTreeCompanionWindow swig_types[13] #define SWIGTYPE_p_wxThinSplitterWindow swig_types[14] #define SWIGTYPE_p_wxSplitterScrolledWindow swig_types[15] @@ -403,16 +252,17 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxLEDNumberCtrl swig_types[19] #define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[20] #define SWIGTYPE_p_wxTreeItemId swig_types[21] -#define SWIGTYPE_p_wxString swig_types[22] -#define SWIGTYPE_p_wxEvtHandler swig_types[23] -#define SWIGTYPE_p_wxFont swig_types[24] -#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[25] -#define SWIGTYPE_p_wxControl swig_types[26] -#define SWIGTYPE_p_wxPanel swig_types[27] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[28] -#define SWIGTYPE_p_wxEvent swig_types[29] -#define SWIGTYPE_p_int swig_types[30] -static swig_type_info *swig_types[32]; +#define SWIGTYPE_p_char swig_types[22] +#define SWIGTYPE_p_wxString swig_types[23] +#define SWIGTYPE_p_wxEvtHandler swig_types[24] +#define SWIGTYPE_p_wxFont swig_types[25] +#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[26] +#define SWIGTYPE_p_wxControl swig_types[27] +#define SWIGTYPE_p_wxPanel swig_types[28] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[29] +#define SWIGTYPE_p_wxEvent swig_types[30] +#define SWIGTYPE_p_int swig_types[31] +static swig_type_info *swig_types[33]; /* -------- TYPES TABLE (END) -------- */ @@ -424,6 +274,44 @@ static swig_type_info *swig_types[32]; #define SWIG_name "_gizmos" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" @@ -444,6 +332,30 @@ static swig_type_info *swig_types[32]; static const wxString wxPyEditableListBoxNameStr(wxT("editableListBox")); static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl")); static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + PyObject *wxEditableListBox_GetStrings(wxEditableListBox *self){ wxArrayString strings; self->GetStrings(strings); @@ -483,6 +395,21 @@ public: PYPRIVATE; }; + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + // C++ version of Python aware control class wxPyTreeListCtrl : public wxTreeListCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeListCtrl); @@ -519,6 +446,17 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl) + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + wxString wxPyTreeListCtrl_GetItemText(wxPyTreeListCtrl *self,wxTreeItemId const &item,int column){ if (column < 0) column = self->GetMainColumn(); return self->GetItemText(item, column); @@ -642,7 +580,7 @@ PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId c #ifdef __cplusplus extern "C" { #endif -static int _wrap_DynamicSashNameStr_set(PyObject *_val) { +static int _wrap_DynamicSashNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DynamicSashNameStr is read-only."); return 1; } @@ -662,7 +600,7 @@ static PyObject *_wrap_DynamicSashNameStr_get() { } -static int _wrap_EditableListBoxNameStr_set(PyObject *_val) { +static int _wrap_EditableListBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable EditableListBoxNameStr is read-only."); return 1; } @@ -682,7 +620,7 @@ static PyObject *_wrap_EditableListBoxNameStr_get() { } -static int _wrap_TreeListCtrlNameStr_set(PyObject *_val) { +static int _wrap_TreeListCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TreeListCtrlNameStr is read-only."); return 1; } @@ -782,15 +720,21 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO 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 *)"Oi|OOlO:new_DynamicSashWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_DynamicSashWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -803,6 +747,12 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -872,16 +822,22 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:DynamicSashWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:DynamicSashWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDynamicSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -894,6 +850,12 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -908,7 +870,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -1004,16 +966,22 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_EditableListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_EditableListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -1031,6 +999,12 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1326,14 +1300,20 @@ static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *ar wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOl:new_RemotelyScrolledTreeCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_RemotelyScrolledTreeCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -1346,6 +1326,12 @@ static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *ar if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRemotelyScrolledTreeCtrl *)new wxRemotelyScrolledTreeCtrl(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1439,12 +1425,22 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_ScrollToLine(PyObject *self, PyO int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "posHoriz",(char *) "posVert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:RemotelyScrolledTreeCtrl_ScrollToLine",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RemotelyScrolledTreeCtrl_ScrollToLine",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRemotelyScrolledTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ScrollToLine(arg2,arg3); @@ -1533,14 +1529,22 @@ static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, P wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_TreeCompanionWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_TreeCompanionWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1553,6 +1557,12 @@ static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyTreeCompanionWindow *)new wxPyTreeCompanionWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1669,14 +1679,22 @@ static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, Py wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_ThinSplitterWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_ThinSplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1689,6 +1707,12 @@ static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, Py if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxThinSplitterWindow *)new wxThinSplitterWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1723,14 +1747,22 @@ static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_SplitterScrolledWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_SplitterScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1743,6 +1775,12 @@ static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSplitterScrolledWindow *)new wxSplitterScrolledWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1777,14 +1815,22 @@ static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObjec wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_LEDNumberCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_LEDNumberCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1797,6 +1843,12 @@ static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLEDNumberCtrl *)new wxLEDNumberCtrl(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1848,15 +1900,23 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb wxSize temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOl:LEDNumberCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:LEDNumberCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLEDNumberCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -1869,6 +1929,12 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6); @@ -1876,7 +1942,7 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1901,7 +1967,7 @@ static PyObject *_wrap_LEDNumberCtrl_GetAlignment(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1926,7 +1992,7 @@ static PyObject *_wrap_LEDNumberCtrl_GetDrawFaded(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1973,16 +2039,21 @@ static PyObject *_wrap_LEDNumberCtrl_SetAlignment(PyObject *self, PyObject *args int arg2 ; bool arg3 = (bool) true ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "Alignment",(char *) "Redraw", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:LEDNumberCtrl_SetAlignment",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:LEDNumberCtrl_SetAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLEDNumberCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLEDValueAlign) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2015,12 +2086,12 @@ static PyObject *_wrap_LEDNumberCtrl_SetDrawFaded(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:LEDNumberCtrl_SetDrawFaded",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLEDNumberCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2060,7 +2131,7 @@ static PyObject *_wrap_LEDNumberCtrl_SetValue(PyObject *self, PyObject *args, Py } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2103,12 +2174,14 @@ static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, Py wxTreeListColumnInfo *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "text",(char *) "image",(char *) "width",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiOi:new_TreeListColumnInfo",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TreeListColumnInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -2116,9 +2189,21 @@ static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, Py temp1 = True; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxTreeListColumnAlign) SWIG_PyObj_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -2162,7 +2247,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2218,7 +2303,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetImage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2243,7 +2328,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetSelectedImage(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2268,7 +2353,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetWidth(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -2280,12 +2365,17 @@ static PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *self, PyObject wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TreeListColumnInfo_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxTreeListColumnAlign) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxTreeListColumnAlign )arg2); @@ -2345,12 +2435,17 @@ static PyObject *_wrap_TreeListColumnInfo_SetImage(PyObject *self, PyObject *arg wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TreeListColumnInfo_SetImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetImage(arg2); @@ -2370,12 +2465,17 @@ static PyObject *_wrap_TreeListColumnInfo_SetSelectedImage(PyObject *self, PyObj wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TreeListColumnInfo_SetSelectedImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetSelectedImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelectedImage(arg2); @@ -2403,7 +2503,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetWidth(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2445,16 +2545,24 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_TreeListCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -2467,6 +2575,12 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -2544,17 +2658,25 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:TreeListCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:TreeListCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -2567,6 +2689,12 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -2587,7 +2715,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -2650,7 +2778,7 @@ static PyObject *_wrap_TreeListCtrl_GetCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -2675,7 +2803,7 @@ static PyObject *_wrap_TreeListCtrl_GetIndent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -2695,7 +2823,7 @@ static PyObject *_wrap_TreeListCtrl_SetIndent(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2730,7 +2858,7 @@ static PyObject *_wrap_TreeListCtrl_GetSpacing(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -2750,7 +2878,7 @@ static PyObject *_wrap_TreeListCtrl_SetSpacing(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2785,7 +2913,7 @@ static PyObject *_wrap_TreeListCtrl_GetLineSpacing(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -2805,7 +2933,7 @@ static PyObject *_wrap_TreeListCtrl_SetLineSpacing(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetLineSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3151,7 +3279,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3196,7 +3324,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumnInfo(PyObject *self, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -3230,7 +3358,7 @@ static PyObject *_wrap_TreeListCtrl_RemoveColumn(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_RemoveColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3265,7 +3393,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnCount(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -3287,11 +3415,11 @@ static PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3322,7 +3450,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3332,7 +3460,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3352,7 +3480,7 @@ static PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3387,7 +3515,7 @@ static PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -3410,7 +3538,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3454,7 +3582,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3492,7 +3620,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -3527,7 +3655,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3554,14 +3682,19 @@ static PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "column",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:TreeListCtrl_SetColumnAlignment",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (wxTreeListColumnAlign) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3592,7 +3725,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3602,7 +3735,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3616,14 +3749,19 @@ static PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *self, PyObject *arg int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "column",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:TreeListCtrl_SetColumnImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3654,7 +3792,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3664,7 +3802,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3679,16 +3817,23 @@ static PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *self, PyObject *args, wxString result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "column", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:TreeListCtrl_GetItemText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_GetItemText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxPyTreeListCtrl_GetItemText(arg1,(wxTreeItemId const &)*arg2,arg3); @@ -3718,16 +3863,30 @@ static PyObject *_wrap_TreeListCtrl_GetItemImage(PyObject *self, PyObject *args, int result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "column",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|ii:TreeListCtrl_GetItemImage",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:TreeListCtrl_GetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxTreeItemIcon) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxPyTreeListCtrl_GetItemImage(arg1,(wxTreeItemId const &)*arg2,arg3,(wxTreeItemIcon )arg4); @@ -3735,7 +3894,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemImage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3752,11 +3911,12 @@ static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args, PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "text",(char *) "column", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:TreeListCtrl_SetItemText",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:TreeListCtrl_SetItemText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -3767,6 +3927,12 @@ static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args, if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyTreeListCtrl_SetItemText(arg1,(wxTreeItemId const &)*arg2,(wxString const &)*arg3,arg4); @@ -3798,16 +3964,35 @@ static PyObject *_wrap_TreeListCtrl_SetItemImage(PyObject *self, PyObject *args, int arg5 = (int) wxTreeItemIcon_Normal ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "image",(char *) "column",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|ii:TreeListCtrl_SetItemImage",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:TreeListCtrl_SetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (wxTreeItemIcon) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyTreeListCtrl_SetItemImage(arg1,(wxTreeItemId const &)*arg2,arg3,arg4,(wxTreeItemIcon )arg5); @@ -3970,7 +4155,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4008,7 +4193,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *self, PyObject *args, } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4160,7 +4345,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4296,7 +4481,7 @@ static PyObject *_wrap_TreeListCtrl_IsVisible(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4327,7 +4512,7 @@ static PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4358,7 +4543,7 @@ static PyObject *_wrap_TreeListCtrl_IsExpanded(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4389,7 +4574,7 @@ static PyObject *_wrap_TreeListCtrl_IsSelected(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4420,7 +4605,7 @@ static PyObject *_wrap_TreeListCtrl_IsBold(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4448,7 +4633,7 @@ static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *self, PyObject *a } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4459,7 +4644,7 @@ static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -4623,16 +4808,21 @@ static PyObject *_wrap_TreeListCtrl_GetNextChild(PyObject *self, PyObject *args, PyObject *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "cookie", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:TreeListCtrl_GetNextChild",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_GetNextChild",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyTreeListCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,arg3); @@ -4897,18 +5087,32 @@ static PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiO:TreeListCtrl_AddRoot",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:TreeListCtrl_AddRoot",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -4951,12 +5155,14 @@ static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args, PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiO:TreeListCtrl_PrependItem",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:TreeListCtrl_PrependItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -4967,6 +5173,18 @@ static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args, if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5011,12 +5229,14 @@ static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, P PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "idPrevious",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iiO:TreeListCtrl_InsertItem",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:TreeListCtrl_InsertItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -5031,6 +5251,18 @@ static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, P if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5075,19 +5307,21 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "index",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iiO:TreeListCtrl_InsertItemBefore",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:TreeListCtrl_InsertItemBefore",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -5095,6 +5329,18 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5137,12 +5383,14 @@ static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, P PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiO:TreeListCtrl_AppendItem",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:TreeListCtrl_AppendItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -5153,6 +5401,18 @@ static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, P if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5486,13 +5746,13 @@ static PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *self, PyObject *args, P } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -5641,7 +5901,7 @@ static PyObject *_wrap_TreeListCtrl_GetBoundingRect(PyObject *self, PyObject *ar } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5773,7 +6033,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemSelectedImage(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5787,16 +6047,21 @@ static PyObject *_wrap_TreeListCtrl_SetItemSelectedImage(PyObject *self, PyObjec int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:TreeListCtrl_SetItemSelectedImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemSelectedImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetItemSelectedImage((wxTreeItemId const &)*arg2,arg3); @@ -7498,10 +7763,10 @@ static swig_type_info _swigt__p_wxTreeListColumnInfo[] = {{"_p_wxTreeListColumnI static swig_type_info _swigt__p_wxPyTreeListCtrl[] = {{"_p_wxPyTreeListCtrl", 0, "wxPyTreeListCtrl *", 0},{"_p_wxPyTreeListCtrl"},{0}}; static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}}; static swig_type_info _swigt__p_wxScrollBar[] = {{"_p_wxScrollBar", 0, "wxScrollBar *", 0},{"_p_wxScrollBar"},{0}}; -static swig_type_info _swigt__p_wxDynamicSashWindow[] = {{"_p_wxDynamicSashWindow", 0, "wxDynamicSashWindow *", 0},{"_p_wxDynamicSashWindow"},{0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxScrolledWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{0}}; static swig_type_info _swigt__p_wxSplitterWindow[] = {{"_p_wxSplitterWindow", 0, "wxSplitterWindow *", 0},{"_p_wxSplitterWindow"},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxSplitterWindow},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxWindow},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxWindow},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxWindow},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxWindow},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxWindow},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxWindow},{"_p_wxPyControl", _p_wxPyControlTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxGauge", _p_wxGaugeTo_p_wxWindow},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxWindow},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxWindow},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxWindow},{"_p_wxChoice", _p_wxChoiceTo_p_wxWindow},{"_p_wxListView", _p_wxListViewTo_p_wxWindow},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxWindow},{"_p_wxNotebook", _p_wxNotebookTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxListbook", _p_wxListbookTo_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_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxWindow},{"_p_wxSlider", _p_wxSliderTo_p_wxWindow},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxWindow},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxWindow},{"_p_wxListBox", _p_wxListBoxTo_p_wxWindow},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxWindow},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxWindow},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxWindow},{"_p_wxButton", _p_wxButtonTo_p_wxWindow},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxWindow},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxWindow},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxWindow},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxWindow},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxWindow},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxWindow},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxWindow},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxToolBar", _p_wxToolBarTo_p_wxWindow},{0}}; +static swig_type_info _swigt__p_wxDynamicSashWindow[] = {{"_p_wxDynamicSashWindow", 0, "wxDynamicSashWindow *", 0},{"_p_wxDynamicSashWindow"},{0}}; static swig_type_info _swigt__p_wxPyTreeCompanionWindow[] = {{"_p_wxPyTreeCompanionWindow", 0, "wxPyTreeCompanionWindow *", 0},{"_p_wxPyTreeCompanionWindow"},{0}}; static swig_type_info _swigt__p_wxThinSplitterWindow[] = {{"_p_wxThinSplitterWindow", 0, "wxThinSplitterWindow *", 0},{"_p_wxThinSplitterWindow"},{0}}; static swig_type_info _swigt__p_wxSplitterScrolledWindow[] = {{"_p_wxSplitterScrolledWindow", 0, "wxSplitterScrolledWindow *", 0},{"_p_wxSplitterScrolledWindow"},{0}}; @@ -7511,6 +7776,7 @@ static swig_type_info _swigt__p_wxArrayString[] = {{"_p_wxArrayString", 0, "wxAr static swig_type_info _swigt__p_wxLEDNumberCtrl[] = {{"_p_wxLEDNumberCtrl", 0, "wxLEDNumberCtrl *", 0},{"_p_wxLEDNumberCtrl"},{0}}; static swig_type_info _swigt__p_wxDynamicSashSplitEvent[] = {{"_p_wxDynamicSashSplitEvent", 0, "wxDynamicSashSplitEvent *", 0},{"_p_wxDynamicSashSplitEvent"},{0}}; static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0},{"_p_wxTreeItemId"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxEvtHandler},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxEvtHandler},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxEvtHandler},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxEvtHandler},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxEvtHandler},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxEvtHandler},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxPyControl", _p_wxPyControlTo_p_wxEvtHandler},{"_p_wxGauge", _p_wxGaugeTo_p_wxEvtHandler},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxEvtHandler},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxEvtHandler},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxEvtHandler},{"_p_wxChoice", _p_wxChoiceTo_p_wxEvtHandler},{"_p_wxListView", _p_wxListViewTo_p_wxEvtHandler},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxEvtHandler},{"_p_wxNotebook", _p_wxNotebookTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxListbook", _p_wxListbookTo_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_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxEvtHandler},{"_p_wxSlider", _p_wxSliderTo_p_wxEvtHandler},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxEvtHandler},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxEvtHandler},{"_p_wxListBox", _p_wxListBoxTo_p_wxEvtHandler},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxEvtHandler},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxEvtHandler},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxEvtHandler},{"_p_wxButton", _p_wxButtonTo_p_wxEvtHandler},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxEvtHandler},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxEvtHandler},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxEvtHandler},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxEvtHandler},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxEvtHandler},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxToolBar", _p_wxToolBarTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; @@ -7531,10 +7797,10 @@ _swigt__p_wxTreeListColumnInfo, _swigt__p_wxPyTreeListCtrl, _swigt__p_wxImageList, _swigt__p_wxScrollBar, -_swigt__p_wxDynamicSashWindow, _swigt__p_wxScrolledWindow, _swigt__p_wxSplitterWindow, _swigt__p_wxWindow, +_swigt__p_wxDynamicSashWindow, _swigt__p_wxPyTreeCompanionWindow, _swigt__p_wxThinSplitterWindow, _swigt__p_wxSplitterScrolledWindow, @@ -7544,6 +7810,7 @@ _swigt__p_wxArrayString, _swigt__p_wxLEDNumberCtrl, _swigt__p_wxDynamicSashSplitEvent, _swigt__p_wxTreeItemId, +_swigt__p_char, _swigt__p_wxString, _swigt__p_wxEvtHandler, _swigt__p_wxFont, @@ -7560,22 +7827,6 @@ _swigt__p_int, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"wxEVT_DYNAMIC_SASH_SPLIT", (long) wxEVT_DYNAMIC_SASH_SPLIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DYNAMIC_SASH_UNIFY", (long) wxEVT_DYNAMIC_SASH_UNIFY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DS_MANAGE_SCROLLBARS", (long) wxDS_MANAGE_SCROLLBARS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DS_DRAG_CORNER", (long) wxDS_DRAG_CORNER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EL_ALLOW_NEW", (long) wxEL_ALLOW_NEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EL_ALLOW_EDIT", (long) wxEL_ALLOW_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EL_ALLOW_DELETE", (long) wxEL_ALLOW_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_ALIGN_LEFT", (long) wxLED_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_ALIGN_RIGHT", (long) wxLED_ALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_ALIGN_CENTER", (long) wxLED_ALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_ALIGN_MASK", (long) wxLED_ALIGN_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_DRAW_FADED", (long) wxLED_DRAW_FADED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TL_ALIGN_LEFT", (long) wxTL_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TL_ALIGN_RIGHT", (long) wxTL_ALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TL_ALIGN_CENTER", (long) wxTL_ALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMCOLUMN", (long) wxTREE_HITTEST_ONITEMCOLUMN, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -7606,6 +7857,22 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"DynamicSashNameStr",_wrap_DynamicSashNameStr_get, _wrap_DynamicSashNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"EditableListBoxNameStr",_wrap_EditableListBoxNameStr_get, _wrap_EditableListBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"TreeListCtrlNameStr",_wrap_TreeListCtrlNameStr_get, _wrap_TreeListCtrlNameStr_set); + PyDict_SetItemString(d,"wxEVT_DYNAMIC_SASH_SPLIT", SWIG_PyObj_FromInt((int)wxEVT_DYNAMIC_SASH_SPLIT)); + PyDict_SetItemString(d,"wxEVT_DYNAMIC_SASH_UNIFY", SWIG_PyObj_FromInt((int)wxEVT_DYNAMIC_SASH_UNIFY)); + PyDict_SetItemString(d,"DS_MANAGE_SCROLLBARS", SWIG_PyObj_FromInt((int)wxDS_MANAGE_SCROLLBARS)); + PyDict_SetItemString(d,"DS_DRAG_CORNER", SWIG_PyObj_FromInt((int)wxDS_DRAG_CORNER)); + PyDict_SetItemString(d,"EL_ALLOW_NEW", SWIG_PyObj_FromInt((int)wxEL_ALLOW_NEW)); + PyDict_SetItemString(d,"EL_ALLOW_EDIT", SWIG_PyObj_FromInt((int)wxEL_ALLOW_EDIT)); + PyDict_SetItemString(d,"EL_ALLOW_DELETE", SWIG_PyObj_FromInt((int)wxEL_ALLOW_DELETE)); + PyDict_SetItemString(d,"LED_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxLED_ALIGN_LEFT)); + PyDict_SetItemString(d,"LED_ALIGN_RIGHT", SWIG_PyObj_FromInt((int)wxLED_ALIGN_RIGHT)); + PyDict_SetItemString(d,"LED_ALIGN_CENTER", SWIG_PyObj_FromInt((int)wxLED_ALIGN_CENTER)); + PyDict_SetItemString(d,"LED_ALIGN_MASK", SWIG_PyObj_FromInt((int)wxLED_ALIGN_MASK)); + PyDict_SetItemString(d,"LED_DRAW_FADED", SWIG_PyObj_FromInt((int)wxLED_DRAW_FADED)); + PyDict_SetItemString(d,"TL_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxTL_ALIGN_LEFT)); + PyDict_SetItemString(d,"TL_ALIGN_RIGHT", SWIG_PyObj_FromInt((int)wxTL_ALIGN_RIGHT)); + PyDict_SetItemString(d,"TL_ALIGN_CENTER", SWIG_PyObj_FromInt((int)wxTL_ALIGN_CENTER)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMCOLUMN", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMCOLUMN)); wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow"); diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp index ef71c65a17..024cde0f8d 100644 --- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -390,10 +239,10 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPyTreeListCtrl swig_types[6] #define SWIGTYPE_p_wxImageList swig_types[7] #define SWIGTYPE_p_wxScrollBar swig_types[8] -#define SWIGTYPE_p_wxDynamicSashWindow swig_types[9] -#define SWIGTYPE_p_wxScrolledWindow swig_types[10] -#define SWIGTYPE_p_wxSplitterWindow swig_types[11] -#define SWIGTYPE_p_wxWindow swig_types[12] +#define SWIGTYPE_p_wxScrolledWindow swig_types[9] +#define SWIGTYPE_p_wxSplitterWindow swig_types[10] +#define SWIGTYPE_p_wxWindow swig_types[11] +#define SWIGTYPE_p_wxDynamicSashWindow swig_types[12] #define SWIGTYPE_p_wxPyTreeCompanionWindow swig_types[13] #define SWIGTYPE_p_wxThinSplitterWindow swig_types[14] #define SWIGTYPE_p_wxSplitterScrolledWindow swig_types[15] @@ -403,16 +252,17 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxLEDNumberCtrl swig_types[19] #define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[20] #define SWIGTYPE_p_wxTreeItemId swig_types[21] -#define SWIGTYPE_p_wxString swig_types[22] -#define SWIGTYPE_p_wxEvtHandler swig_types[23] -#define SWIGTYPE_p_wxFont swig_types[24] -#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[25] -#define SWIGTYPE_p_wxControl swig_types[26] -#define SWIGTYPE_p_wxPanel swig_types[27] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[28] -#define SWIGTYPE_p_wxEvent swig_types[29] -#define SWIGTYPE_p_int swig_types[30] -static swig_type_info *swig_types[32]; +#define SWIGTYPE_p_char swig_types[22] +#define SWIGTYPE_p_wxString swig_types[23] +#define SWIGTYPE_p_wxEvtHandler swig_types[24] +#define SWIGTYPE_p_wxFont swig_types[25] +#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[26] +#define SWIGTYPE_p_wxControl swig_types[27] +#define SWIGTYPE_p_wxPanel swig_types[28] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[29] +#define SWIGTYPE_p_wxEvent swig_types[30] +#define SWIGTYPE_p_int swig_types[31] +static swig_type_info *swig_types[33]; /* -------- TYPES TABLE (END) -------- */ @@ -424,6 +274,44 @@ static swig_type_info *swig_types[32]; #define SWIG_name "_gizmos" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" @@ -444,6 +332,30 @@ static swig_type_info *swig_types[32]; static const wxString wxPyEditableListBoxNameStr(wxT("editableListBox")); static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl")); static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + PyObject *wxEditableListBox_GetStrings(wxEditableListBox *self){ wxArrayString strings; self->GetStrings(strings); @@ -483,6 +395,21 @@ public: PYPRIVATE; }; + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + // C++ version of Python aware control class wxPyTreeListCtrl : public wxTreeListCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeListCtrl); @@ -519,6 +446,17 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl) + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + wxString wxPyTreeListCtrl_GetItemText(wxPyTreeListCtrl *self,wxTreeItemId const &item,int column){ if (column < 0) column = self->GetMainColumn(); return self->GetItemText(item, column); @@ -642,7 +580,7 @@ PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId c #ifdef __cplusplus extern "C" { #endif -static int _wrap_DynamicSashNameStr_set(PyObject *_val) { +static int _wrap_DynamicSashNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DynamicSashNameStr is read-only."); return 1; } @@ -662,7 +600,7 @@ static PyObject *_wrap_DynamicSashNameStr_get() { } -static int _wrap_EditableListBoxNameStr_set(PyObject *_val) { +static int _wrap_EditableListBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable EditableListBoxNameStr is read-only."); return 1; } @@ -682,7 +620,7 @@ static PyObject *_wrap_EditableListBoxNameStr_get() { } -static int _wrap_TreeListCtrlNameStr_set(PyObject *_val) { +static int _wrap_TreeListCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TreeListCtrlNameStr is read-only."); return 1; } @@ -782,15 +720,21 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO 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 *)"Oi|OOlO:new_DynamicSashWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_DynamicSashWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -803,6 +747,12 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -872,16 +822,22 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:DynamicSashWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:DynamicSashWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDynamicSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -894,6 +850,12 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -908,7 +870,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -1004,16 +966,22 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_EditableListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_EditableListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -1031,6 +999,12 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1326,14 +1300,20 @@ static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *ar wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOl:new_RemotelyScrolledTreeCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_RemotelyScrolledTreeCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -1346,6 +1326,12 @@ static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *ar if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRemotelyScrolledTreeCtrl *)new wxRemotelyScrolledTreeCtrl(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1439,12 +1425,22 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_ScrollToLine(PyObject *self, PyO int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "posHoriz",(char *) "posVert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:RemotelyScrolledTreeCtrl_ScrollToLine",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RemotelyScrolledTreeCtrl_ScrollToLine",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRemotelyScrolledTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ScrollToLine(arg2,arg3); @@ -1533,14 +1529,22 @@ static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, P wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_TreeCompanionWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_TreeCompanionWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1553,6 +1557,12 @@ static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyTreeCompanionWindow *)new wxPyTreeCompanionWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1669,14 +1679,22 @@ static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, Py wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_ThinSplitterWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_ThinSplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1689,6 +1707,12 @@ static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, Py if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxThinSplitterWindow *)new wxThinSplitterWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1723,14 +1747,22 @@ static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_SplitterScrolledWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_SplitterScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1743,6 +1775,12 @@ static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSplitterScrolledWindow *)new wxSplitterScrolledWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1777,14 +1815,22 @@ static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObjec wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_LEDNumberCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_LEDNumberCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1797,6 +1843,12 @@ static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLEDNumberCtrl *)new wxLEDNumberCtrl(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -1848,15 +1900,23 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb wxSize temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOl:LEDNumberCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:LEDNumberCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLEDNumberCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -1869,6 +1929,12 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6); @@ -1876,7 +1942,7 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1901,7 +1967,7 @@ static PyObject *_wrap_LEDNumberCtrl_GetAlignment(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1926,7 +1992,7 @@ static PyObject *_wrap_LEDNumberCtrl_GetDrawFaded(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1973,16 +2039,21 @@ static PyObject *_wrap_LEDNumberCtrl_SetAlignment(PyObject *self, PyObject *args int arg2 ; bool arg3 = (bool) true ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "Alignment",(char *) "Redraw", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:LEDNumberCtrl_SetAlignment",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:LEDNumberCtrl_SetAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLEDNumberCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLEDValueAlign) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2015,12 +2086,12 @@ static PyObject *_wrap_LEDNumberCtrl_SetDrawFaded(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:LEDNumberCtrl_SetDrawFaded",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLEDNumberCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2060,7 +2131,7 @@ static PyObject *_wrap_LEDNumberCtrl_SetValue(PyObject *self, PyObject *args, Py } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2103,12 +2174,14 @@ static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, Py wxTreeListColumnInfo *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "text",(char *) "image",(char *) "width",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiOi:new_TreeListColumnInfo",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TreeListColumnInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -2116,9 +2189,21 @@ static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, Py temp1 = True; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxTreeListColumnAlign) SWIG_PyObj_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -2162,7 +2247,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2218,7 +2303,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetImage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2243,7 +2328,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetSelectedImage(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2268,7 +2353,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetWidth(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -2280,12 +2365,17 @@ static PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *self, PyObject wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TreeListColumnInfo_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxTreeListColumnAlign) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxTreeListColumnAlign )arg2); @@ -2345,12 +2435,17 @@ static PyObject *_wrap_TreeListColumnInfo_SetImage(PyObject *self, PyObject *arg wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TreeListColumnInfo_SetImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetImage(arg2); @@ -2370,12 +2465,17 @@ static PyObject *_wrap_TreeListColumnInfo_SetSelectedImage(PyObject *self, PyObj wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TreeListColumnInfo_SetSelectedImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetSelectedImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelectedImage(arg2); @@ -2403,7 +2503,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetWidth(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2445,16 +2545,24 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_TreeListCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -2467,6 +2575,12 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -2544,17 +2658,25 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:TreeListCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:TreeListCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -2567,6 +2689,12 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -2587,7 +2715,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -2650,7 +2778,7 @@ static PyObject *_wrap_TreeListCtrl_GetCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -2675,7 +2803,7 @@ static PyObject *_wrap_TreeListCtrl_GetIndent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -2695,7 +2823,7 @@ static PyObject *_wrap_TreeListCtrl_SetIndent(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2730,7 +2858,7 @@ static PyObject *_wrap_TreeListCtrl_GetSpacing(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -2750,7 +2878,7 @@ static PyObject *_wrap_TreeListCtrl_SetSpacing(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2785,7 +2913,7 @@ static PyObject *_wrap_TreeListCtrl_GetLineSpacing(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -2805,7 +2933,7 @@ static PyObject *_wrap_TreeListCtrl_SetLineSpacing(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetLineSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3151,7 +3279,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3196,7 +3324,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumnInfo(PyObject *self, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -3230,7 +3358,7 @@ static PyObject *_wrap_TreeListCtrl_RemoveColumn(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_RemoveColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3265,7 +3393,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnCount(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -3287,11 +3415,11 @@ static PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3322,7 +3450,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3332,7 +3460,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3352,7 +3480,7 @@ static PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3387,7 +3515,7 @@ static PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -3410,7 +3538,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3454,7 +3582,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3492,7 +3620,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTreeListColumnInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -3527,7 +3655,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3554,14 +3682,19 @@ static PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "column",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:TreeListCtrl_SetColumnAlignment",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (wxTreeListColumnAlign) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3592,7 +3725,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3602,7 +3735,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3616,14 +3749,19 @@ static PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *self, PyObject *arg int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "column",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:TreeListCtrl_SetColumnImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3654,7 +3792,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3664,7 +3802,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3679,16 +3817,23 @@ static PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *self, PyObject *args, wxString result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "column", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:TreeListCtrl_GetItemText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_GetItemText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxPyTreeListCtrl_GetItemText(arg1,(wxTreeItemId const &)*arg2,arg3); @@ -3718,16 +3863,30 @@ static PyObject *_wrap_TreeListCtrl_GetItemImage(PyObject *self, PyObject *args, int result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "column",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|ii:TreeListCtrl_GetItemImage",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:TreeListCtrl_GetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxTreeItemIcon) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxPyTreeListCtrl_GetItemImage(arg1,(wxTreeItemId const &)*arg2,arg3,(wxTreeItemIcon )arg4); @@ -3735,7 +3894,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemImage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3752,11 +3911,12 @@ static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args, PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "text",(char *) "column", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:TreeListCtrl_SetItemText",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:TreeListCtrl_SetItemText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -3767,6 +3927,12 @@ static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args, if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyTreeListCtrl_SetItemText(arg1,(wxTreeItemId const &)*arg2,(wxString const &)*arg3,arg4); @@ -3798,16 +3964,35 @@ static PyObject *_wrap_TreeListCtrl_SetItemImage(PyObject *self, PyObject *args, int arg5 = (int) wxTreeItemIcon_Normal ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "image",(char *) "column",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|ii:TreeListCtrl_SetItemImage",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:TreeListCtrl_SetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (wxTreeItemIcon) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyTreeListCtrl_SetItemImage(arg1,(wxTreeItemId const &)*arg2,arg3,arg4,(wxTreeItemIcon )arg5); @@ -3970,7 +4155,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4008,7 +4193,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *self, PyObject *args, } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4160,7 +4345,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4296,7 +4481,7 @@ static PyObject *_wrap_TreeListCtrl_IsVisible(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4327,7 +4512,7 @@ static PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4358,7 +4543,7 @@ static PyObject *_wrap_TreeListCtrl_IsExpanded(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4389,7 +4574,7 @@ static PyObject *_wrap_TreeListCtrl_IsSelected(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4420,7 +4605,7 @@ static PyObject *_wrap_TreeListCtrl_IsBold(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4448,7 +4633,7 @@ static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *self, PyObject *a } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4459,7 +4644,7 @@ static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -4623,16 +4808,21 @@ static PyObject *_wrap_TreeListCtrl_GetNextChild(PyObject *self, PyObject *args, PyObject *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "cookie", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:TreeListCtrl_GetNextChild",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_GetNextChild",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxPyTreeListCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,arg3); @@ -4897,18 +5087,32 @@ static PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiO:TreeListCtrl_AddRoot",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:TreeListCtrl_AddRoot",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -4951,12 +5155,14 @@ static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args, PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiO:TreeListCtrl_PrependItem",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:TreeListCtrl_PrependItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -4967,6 +5173,18 @@ static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args, if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5011,12 +5229,14 @@ static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, P PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "idPrevious",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iiO:TreeListCtrl_InsertItem",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:TreeListCtrl_InsertItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -5031,6 +5251,18 @@ static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, P if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5075,19 +5307,21 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "index",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iiO:TreeListCtrl_InsertItemBefore",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:TreeListCtrl_InsertItemBefore",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -5095,6 +5329,18 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5137,12 +5383,14 @@ static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, P PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiO:TreeListCtrl_AppendItem",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:TreeListCtrl_AppendItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -5153,6 +5401,18 @@ static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, P if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5486,13 +5746,13 @@ static PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *self, PyObject *args, P } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -5641,7 +5901,7 @@ static PyObject *_wrap_TreeListCtrl_GetBoundingRect(PyObject *self, PyObject *ar } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5773,7 +6033,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemSelectedImage(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5787,16 +6047,21 @@ static PyObject *_wrap_TreeListCtrl_SetItemSelectedImage(PyObject *self, PyObjec int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:TreeListCtrl_SetItemSelectedImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemSelectedImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetItemSelectedImage((wxTreeItemId const &)*arg2,arg3); @@ -7498,10 +7763,10 @@ static swig_type_info _swigt__p_wxTreeListColumnInfo[] = {{"_p_wxTreeListColumnI static swig_type_info _swigt__p_wxPyTreeListCtrl[] = {{"_p_wxPyTreeListCtrl", 0, "wxPyTreeListCtrl *", 0},{"_p_wxPyTreeListCtrl"},{0}}; static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}}; static swig_type_info _swigt__p_wxScrollBar[] = {{"_p_wxScrollBar", 0, "wxScrollBar *", 0},{"_p_wxScrollBar"},{0}}; -static swig_type_info _swigt__p_wxDynamicSashWindow[] = {{"_p_wxDynamicSashWindow", 0, "wxDynamicSashWindow *", 0},{"_p_wxDynamicSashWindow"},{0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxScrolledWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{0}}; static swig_type_info _swigt__p_wxSplitterWindow[] = {{"_p_wxSplitterWindow", 0, "wxSplitterWindow *", 0},{"_p_wxSplitterWindow"},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxSplitterWindow},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxWindow},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxWindow},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxWindow},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxWindow},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxWindow},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxWindow},{"_p_wxPyControl", _p_wxPyControlTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxGauge", _p_wxGaugeTo_p_wxWindow},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxWindow},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxWindow},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxWindow},{"_p_wxChoice", _p_wxChoiceTo_p_wxWindow},{"_p_wxListView", _p_wxListViewTo_p_wxWindow},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxWindow},{"_p_wxNotebook", _p_wxNotebookTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxListbook", _p_wxListbookTo_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_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxWindow},{"_p_wxSlider", _p_wxSliderTo_p_wxWindow},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxWindow},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxWindow},{"_p_wxListBox", _p_wxListBoxTo_p_wxWindow},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxWindow},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxWindow},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxWindow},{"_p_wxButton", _p_wxButtonTo_p_wxWindow},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxWindow},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxWindow},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxWindow},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxWindow},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxWindow},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxWindow},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxWindow},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxToolBar", _p_wxToolBarTo_p_wxWindow},{0}}; +static swig_type_info _swigt__p_wxDynamicSashWindow[] = {{"_p_wxDynamicSashWindow", 0, "wxDynamicSashWindow *", 0},{"_p_wxDynamicSashWindow"},{0}}; static swig_type_info _swigt__p_wxPyTreeCompanionWindow[] = {{"_p_wxPyTreeCompanionWindow", 0, "wxPyTreeCompanionWindow *", 0},{"_p_wxPyTreeCompanionWindow"},{0}}; static swig_type_info _swigt__p_wxThinSplitterWindow[] = {{"_p_wxThinSplitterWindow", 0, "wxThinSplitterWindow *", 0},{"_p_wxThinSplitterWindow"},{0}}; static swig_type_info _swigt__p_wxSplitterScrolledWindow[] = {{"_p_wxSplitterScrolledWindow", 0, "wxSplitterScrolledWindow *", 0},{"_p_wxSplitterScrolledWindow"},{0}}; @@ -7511,6 +7776,7 @@ static swig_type_info _swigt__p_wxArrayString[] = {{"_p_wxArrayString", 0, "wxAr static swig_type_info _swigt__p_wxLEDNumberCtrl[] = {{"_p_wxLEDNumberCtrl", 0, "wxLEDNumberCtrl *", 0},{"_p_wxLEDNumberCtrl"},{0}}; static swig_type_info _swigt__p_wxDynamicSashSplitEvent[] = {{"_p_wxDynamicSashSplitEvent", 0, "wxDynamicSashSplitEvent *", 0},{"_p_wxDynamicSashSplitEvent"},{0}}; static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0},{"_p_wxTreeItemId"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxEvtHandler},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxEvtHandler},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxEvtHandler},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxEvtHandler},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxEvtHandler},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxEvtHandler},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxPyControl", _p_wxPyControlTo_p_wxEvtHandler},{"_p_wxGauge", _p_wxGaugeTo_p_wxEvtHandler},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxEvtHandler},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxEvtHandler},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxEvtHandler},{"_p_wxChoice", _p_wxChoiceTo_p_wxEvtHandler},{"_p_wxListView", _p_wxListViewTo_p_wxEvtHandler},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxEvtHandler},{"_p_wxNotebook", _p_wxNotebookTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxListbook", _p_wxListbookTo_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_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxEvtHandler},{"_p_wxSlider", _p_wxSliderTo_p_wxEvtHandler},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxEvtHandler},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxEvtHandler},{"_p_wxListBox", _p_wxListBoxTo_p_wxEvtHandler},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxEvtHandler},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxEvtHandler},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxEvtHandler},{"_p_wxButton", _p_wxButtonTo_p_wxEvtHandler},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxEvtHandler},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxEvtHandler},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxEvtHandler},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxEvtHandler},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxEvtHandler},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxToolBar", _p_wxToolBarTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; @@ -7531,10 +7797,10 @@ _swigt__p_wxTreeListColumnInfo, _swigt__p_wxPyTreeListCtrl, _swigt__p_wxImageList, _swigt__p_wxScrollBar, -_swigt__p_wxDynamicSashWindow, _swigt__p_wxScrolledWindow, _swigt__p_wxSplitterWindow, _swigt__p_wxWindow, +_swigt__p_wxDynamicSashWindow, _swigt__p_wxPyTreeCompanionWindow, _swigt__p_wxThinSplitterWindow, _swigt__p_wxSplitterScrolledWindow, @@ -7544,6 +7810,7 @@ _swigt__p_wxArrayString, _swigt__p_wxLEDNumberCtrl, _swigt__p_wxDynamicSashSplitEvent, _swigt__p_wxTreeItemId, +_swigt__p_char, _swigt__p_wxString, _swigt__p_wxEvtHandler, _swigt__p_wxFont, @@ -7560,22 +7827,6 @@ _swigt__p_int, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"wxEVT_DYNAMIC_SASH_SPLIT", (long) wxEVT_DYNAMIC_SASH_SPLIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DYNAMIC_SASH_UNIFY", (long) wxEVT_DYNAMIC_SASH_UNIFY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DS_MANAGE_SCROLLBARS", (long) wxDS_MANAGE_SCROLLBARS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DS_DRAG_CORNER", (long) wxDS_DRAG_CORNER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EL_ALLOW_NEW", (long) wxEL_ALLOW_NEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EL_ALLOW_EDIT", (long) wxEL_ALLOW_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EL_ALLOW_DELETE", (long) wxEL_ALLOW_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_ALIGN_LEFT", (long) wxLED_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_ALIGN_RIGHT", (long) wxLED_ALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_ALIGN_CENTER", (long) wxLED_ALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_ALIGN_MASK", (long) wxLED_ALIGN_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LED_DRAW_FADED", (long) wxLED_DRAW_FADED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TL_ALIGN_LEFT", (long) wxTL_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TL_ALIGN_RIGHT", (long) wxTL_ALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TL_ALIGN_CENTER", (long) wxTL_ALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMCOLUMN", (long) wxTREE_HITTEST_ONITEMCOLUMN, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -7606,6 +7857,22 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"DynamicSashNameStr",_wrap_DynamicSashNameStr_get, _wrap_DynamicSashNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"EditableListBoxNameStr",_wrap_EditableListBoxNameStr_get, _wrap_EditableListBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"TreeListCtrlNameStr",_wrap_TreeListCtrlNameStr_get, _wrap_TreeListCtrlNameStr_set); + PyDict_SetItemString(d,"wxEVT_DYNAMIC_SASH_SPLIT", SWIG_PyObj_FromInt((int)wxEVT_DYNAMIC_SASH_SPLIT)); + PyDict_SetItemString(d,"wxEVT_DYNAMIC_SASH_UNIFY", SWIG_PyObj_FromInt((int)wxEVT_DYNAMIC_SASH_UNIFY)); + PyDict_SetItemString(d,"DS_MANAGE_SCROLLBARS", SWIG_PyObj_FromInt((int)wxDS_MANAGE_SCROLLBARS)); + PyDict_SetItemString(d,"DS_DRAG_CORNER", SWIG_PyObj_FromInt((int)wxDS_DRAG_CORNER)); + PyDict_SetItemString(d,"EL_ALLOW_NEW", SWIG_PyObj_FromInt((int)wxEL_ALLOW_NEW)); + PyDict_SetItemString(d,"EL_ALLOW_EDIT", SWIG_PyObj_FromInt((int)wxEL_ALLOW_EDIT)); + PyDict_SetItemString(d,"EL_ALLOW_DELETE", SWIG_PyObj_FromInt((int)wxEL_ALLOW_DELETE)); + PyDict_SetItemString(d,"LED_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxLED_ALIGN_LEFT)); + PyDict_SetItemString(d,"LED_ALIGN_RIGHT", SWIG_PyObj_FromInt((int)wxLED_ALIGN_RIGHT)); + PyDict_SetItemString(d,"LED_ALIGN_CENTER", SWIG_PyObj_FromInt((int)wxLED_ALIGN_CENTER)); + PyDict_SetItemString(d,"LED_ALIGN_MASK", SWIG_PyObj_FromInt((int)wxLED_ALIGN_MASK)); + PyDict_SetItemString(d,"LED_DRAW_FADED", SWIG_PyObj_FromInt((int)wxLED_DRAW_FADED)); + PyDict_SetItemString(d,"TL_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxTL_ALIGN_LEFT)); + PyDict_SetItemString(d,"TL_ALIGN_RIGHT", SWIG_PyObj_FromInt((int)wxTL_ALIGN_RIGHT)); + PyDict_SetItemString(d,"TL_ALIGN_CENTER", SWIG_PyObj_FromInt((int)wxTL_ALIGN_CENTER)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMCOLUMN", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMCOLUMN)); wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow"); diff --git a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp index 6aad6de89e..c2326871a7 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -384,12 +233,13 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxWindow swig_types[0] #define SWIGTYPE_p_wxObject swig_types[1] #define SWIGTYPE_p_wxEvtHandler swig_types[2] -#define SWIGTYPE_p_wxPalette swig_types[3] -#define SWIGTYPE_p_wxGLCanvas swig_types[4] -#define SWIGTYPE_p_wxString swig_types[5] -#define SWIGTYPE_p_wxGLContext swig_types[6] -#define SWIGTYPE_p_int swig_types[7] -static swig_type_info *swig_types[9]; +#define SWIGTYPE_p_char swig_types[3] +#define SWIGTYPE_p_wxPalette swig_types[4] +#define SWIGTYPE_p_wxGLCanvas swig_types[5] +#define SWIGTYPE_p_wxString swig_types[6] +#define SWIGTYPE_p_wxGLContext swig_types[7] +#define SWIGTYPE_p_int swig_types[8] +static swig_type_info *swig_types[10]; /* -------- TYPES TABLE (END) -------- */ @@ -401,6 +251,44 @@ static swig_type_info *swig_types[9]; #define SWIG_name "_glcanvas" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" @@ -409,14 +297,36 @@ static swig_type_info *swig_types[9]; static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas")); static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + wxGLContext *new_wxGLContext(bool isRGB,wxGLCanvas *win,wxPalette const &palette,wxGLContext const *other){ AGLPixelFormat fmt; // TODO: How should this be initialized? return new wxGLContext(fmt, win, palette, other); } + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + #ifdef __cplusplus extern "C" { #endif -static int _wrap_GLCanvasNameStr_set(PyObject *_val) { +static int _wrap_GLCanvasNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GLCanvasNameStr is read-only."); return 1; } @@ -454,7 +364,7 @@ static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_GLContext",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGLCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -647,8 +557,10 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw bool temp6 = False ; int *temp7 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; @@ -656,8 +568,14 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name",(char *) "attribList",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOOO:new_GLCanvas",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOO:new_GLCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -670,6 +588,12 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -747,8 +671,10 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P int *temp8 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; @@ -756,11 +682,17 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P (char *) "parent",(char *) "shared",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name",(char *) "attribList",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OiOOlOOO:new_GLCanvasWithContext",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOOO:new_GLCanvasWithContext",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -773,6 +705,12 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1236,6 +1174,7 @@ static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxGLCanvas", _p_wxGLCanvasTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_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_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxGLContext", _p_wxGLContextTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_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_wxGLCanvas", _p_wxGLCanvasTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_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_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxGLCanvas", _p_wxGLCanvasTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0},{"_p_wxPalette"},{0}}; static swig_type_info _swigt__p_wxGLCanvas[] = {{"_p_wxGLCanvas", 0, "wxGLCanvas *", 0},{"_p_wxGLCanvas"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; @@ -1246,6 +1185,7 @@ static swig_type_info *swig_types_initial[] = { _swigt__p_wxWindow, _swigt__p_wxObject, _swigt__p_wxEvtHandler, +_swigt__p_char, _swigt__p_wxPalette, _swigt__p_wxGLCanvas, _swigt__p_wxString, @@ -1258,22 +1198,6 @@ _swigt__p_int, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"WX_GL_RGBA", (long) WX_GL_RGBA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_BUFFER_SIZE", (long) WX_GL_BUFFER_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_LEVEL", (long) WX_GL_LEVEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_DOUBLEBUFFER", (long) WX_GL_DOUBLEBUFFER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_STEREO", (long) WX_GL_STEREO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_AUX_BUFFERS", (long) WX_GL_AUX_BUFFERS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_RED", (long) WX_GL_MIN_RED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_GREEN", (long) WX_GL_MIN_GREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_BLUE", (long) WX_GL_MIN_BLUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ALPHA", (long) WX_GL_MIN_ALPHA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_DEPTH_SIZE", (long) WX_GL_DEPTH_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_STENCIL_SIZE", (long) WX_GL_STENCIL_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ACCUM_RED", (long) WX_GL_MIN_ACCUM_RED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ACCUM_GREEN", (long) WX_GL_MIN_ACCUM_GREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ACCUM_BLUE", (long) WX_GL_MIN_ACCUM_BLUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ACCUM_ALPHA", (long) WX_GL_MIN_ACCUM_ALPHA, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -1302,6 +1226,22 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"GLCanvasNameStr",_wrap_GLCanvasNameStr_get, _wrap_GLCanvasNameStr_set); + PyDict_SetItemString(d,"WX_GL_RGBA", SWIG_PyObj_FromInt((int)WX_GL_RGBA)); + PyDict_SetItemString(d,"WX_GL_BUFFER_SIZE", SWIG_PyObj_FromInt((int)WX_GL_BUFFER_SIZE)); + PyDict_SetItemString(d,"WX_GL_LEVEL", SWIG_PyObj_FromInt((int)WX_GL_LEVEL)); + PyDict_SetItemString(d,"WX_GL_DOUBLEBUFFER", SWIG_PyObj_FromInt((int)WX_GL_DOUBLEBUFFER)); + PyDict_SetItemString(d,"WX_GL_STEREO", SWIG_PyObj_FromInt((int)WX_GL_STEREO)); + PyDict_SetItemString(d,"WX_GL_AUX_BUFFERS", SWIG_PyObj_FromInt((int)WX_GL_AUX_BUFFERS)); + PyDict_SetItemString(d,"WX_GL_MIN_RED", SWIG_PyObj_FromInt((int)WX_GL_MIN_RED)); + PyDict_SetItemString(d,"WX_GL_MIN_GREEN", SWIG_PyObj_FromInt((int)WX_GL_MIN_GREEN)); + PyDict_SetItemString(d,"WX_GL_MIN_BLUE", SWIG_PyObj_FromInt((int)WX_GL_MIN_BLUE)); + PyDict_SetItemString(d,"WX_GL_MIN_ALPHA", SWIG_PyObj_FromInt((int)WX_GL_MIN_ALPHA)); + PyDict_SetItemString(d,"WX_GL_DEPTH_SIZE", SWIG_PyObj_FromInt((int)WX_GL_DEPTH_SIZE)); + PyDict_SetItemString(d,"WX_GL_STENCIL_SIZE", SWIG_PyObj_FromInt((int)WX_GL_STENCIL_SIZE)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_RED", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_RED)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_GREEN", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_GREEN)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_BLUE", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_BLUE)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_ALPHA", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_ALPHA)); diff --git a/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp index f554e1c587..9616cb59d4 100644 --- a/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -384,12 +233,13 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxWindow swig_types[0] #define SWIGTYPE_p_wxObject swig_types[1] #define SWIGTYPE_p_wxEvtHandler swig_types[2] -#define SWIGTYPE_p_wxPalette swig_types[3] -#define SWIGTYPE_p_wxGLCanvas swig_types[4] -#define SWIGTYPE_p_wxString swig_types[5] -#define SWIGTYPE_p_wxGLContext swig_types[6] -#define SWIGTYPE_p_int swig_types[7] -static swig_type_info *swig_types[9]; +#define SWIGTYPE_p_char swig_types[3] +#define SWIGTYPE_p_wxPalette swig_types[4] +#define SWIGTYPE_p_wxGLCanvas swig_types[5] +#define SWIGTYPE_p_wxString swig_types[6] +#define SWIGTYPE_p_wxGLContext swig_types[7] +#define SWIGTYPE_p_int swig_types[8] +static swig_type_info *swig_types[10]; /* -------- TYPES TABLE (END) -------- */ @@ -401,6 +251,44 @@ static swig_type_info *swig_types[9]; #define SWIG_name "_glcanvas" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" @@ -409,10 +297,32 @@ static swig_type_info *swig_types[9]; static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas")); static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + #ifdef __cplusplus extern "C" { #endif -static int _wrap_GLCanvasNameStr_set(PyObject *_val) { +static int _wrap_GLCanvasNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GLCanvasNameStr is read-only."); return 1; } @@ -450,7 +360,7 @@ static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_GLContext",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGLCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -643,8 +553,10 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw bool temp6 = False ; int *temp7 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; @@ -652,8 +564,14 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name",(char *) "attribList",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOOO:new_GLCanvas",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOO:new_GLCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -666,6 +584,12 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -743,8 +667,10 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P int *temp8 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; @@ -752,11 +678,17 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P (char *) "parent",(char *) "shared",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name",(char *) "attribList",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OiOOlOOO:new_GLCanvasWithContext",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOOO:new_GLCanvasWithContext",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGLContext,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -769,6 +701,12 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1367,6 +1305,7 @@ static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxGLCanvas", _p_wxGLCanvasTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_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_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxGLContext", _p_wxGLContextTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_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_wxGLCanvas", _p_wxGLCanvasTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_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_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxGLCanvas", _p_wxGLCanvasTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0},{"_p_wxPalette"},{0}}; static swig_type_info _swigt__p_wxGLCanvas[] = {{"_p_wxGLCanvas", 0, "wxGLCanvas *", 0},{"_p_wxGLCanvas"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; @@ -1377,6 +1316,7 @@ static swig_type_info *swig_types_initial[] = { _swigt__p_wxWindow, _swigt__p_wxObject, _swigt__p_wxEvtHandler, +_swigt__p_char, _swigt__p_wxPalette, _swigt__p_wxGLCanvas, _swigt__p_wxString, @@ -1389,22 +1329,6 @@ _swigt__p_int, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"WX_GL_RGBA", (long) WX_GL_RGBA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_BUFFER_SIZE", (long) WX_GL_BUFFER_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_LEVEL", (long) WX_GL_LEVEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_DOUBLEBUFFER", (long) WX_GL_DOUBLEBUFFER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_STEREO", (long) WX_GL_STEREO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_AUX_BUFFERS", (long) WX_GL_AUX_BUFFERS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_RED", (long) WX_GL_MIN_RED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_GREEN", (long) WX_GL_MIN_GREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_BLUE", (long) WX_GL_MIN_BLUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ALPHA", (long) WX_GL_MIN_ALPHA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_DEPTH_SIZE", (long) WX_GL_DEPTH_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_STENCIL_SIZE", (long) WX_GL_STENCIL_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ACCUM_RED", (long) WX_GL_MIN_ACCUM_RED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ACCUM_GREEN", (long) WX_GL_MIN_ACCUM_GREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ACCUM_BLUE", (long) WX_GL_MIN_ACCUM_BLUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WX_GL_MIN_ACCUM_ALPHA", (long) WX_GL_MIN_ACCUM_ALPHA, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -1433,6 +1357,22 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"GLCanvasNameStr",_wrap_GLCanvasNameStr_get, _wrap_GLCanvasNameStr_set); + PyDict_SetItemString(d,"WX_GL_RGBA", SWIG_PyObj_FromInt((int)WX_GL_RGBA)); + PyDict_SetItemString(d,"WX_GL_BUFFER_SIZE", SWIG_PyObj_FromInt((int)WX_GL_BUFFER_SIZE)); + PyDict_SetItemString(d,"WX_GL_LEVEL", SWIG_PyObj_FromInt((int)WX_GL_LEVEL)); + PyDict_SetItemString(d,"WX_GL_DOUBLEBUFFER", SWIG_PyObj_FromInt((int)WX_GL_DOUBLEBUFFER)); + PyDict_SetItemString(d,"WX_GL_STEREO", SWIG_PyObj_FromInt((int)WX_GL_STEREO)); + PyDict_SetItemString(d,"WX_GL_AUX_BUFFERS", SWIG_PyObj_FromInt((int)WX_GL_AUX_BUFFERS)); + PyDict_SetItemString(d,"WX_GL_MIN_RED", SWIG_PyObj_FromInt((int)WX_GL_MIN_RED)); + PyDict_SetItemString(d,"WX_GL_MIN_GREEN", SWIG_PyObj_FromInt((int)WX_GL_MIN_GREEN)); + PyDict_SetItemString(d,"WX_GL_MIN_BLUE", SWIG_PyObj_FromInt((int)WX_GL_MIN_BLUE)); + PyDict_SetItemString(d,"WX_GL_MIN_ALPHA", SWIG_PyObj_FromInt((int)WX_GL_MIN_ALPHA)); + PyDict_SetItemString(d,"WX_GL_DEPTH_SIZE", SWIG_PyObj_FromInt((int)WX_GL_DEPTH_SIZE)); + PyDict_SetItemString(d,"WX_GL_STENCIL_SIZE", SWIG_PyObj_FromInt((int)WX_GL_STENCIL_SIZE)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_RED", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_RED)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_GREEN", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_GREEN)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_BLUE", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_BLUE)); + PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_ALPHA", SWIG_PyObj_FromInt((int)WX_GL_MIN_ACCUM_ALPHA)); diff --git a/wxPython/contrib/iewin/iewin_wrap.cpp b/wxPython/contrib/iewin/iewin_wrap.cpp index 3555495d9f..343e5df81d 100644 --- a/wxPython/contrib/iewin/iewin_wrap.cpp +++ b/wxPython/contrib/iewin/iewin_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -387,11 +236,12 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxEvent swig_types[3] #define SWIGTYPE_p_wxObject swig_types[4] #define SWIGTYPE_p_wxEvtHandler swig_types[5] -#define SWIGTYPE_p_wxString swig_types[6] -#define SWIGTYPE_p_wxNotifyEvent swig_types[7] -#define SWIGTYPE_p_wxCommandEvent swig_types[8] -#define SWIGTYPE_p_wxInputStream swig_types[9] -static swig_type_info *swig_types[11]; +#define SWIGTYPE_p_char swig_types[6] +#define SWIGTYPE_p_wxString swig_types[7] +#define SWIGTYPE_p_wxNotifyEvent swig_types[8] +#define SWIGTYPE_p_wxCommandEvent swig_types[9] +#define SWIGTYPE_p_wxInputStream swig_types[10] +static swig_type_info *swig_types[12]; /* -------- TYPES TABLE (END) -------- */ @@ -403,6 +253,44 @@ static swig_type_info *swig_types[11]; #define SWIG_name "_iewin" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/pyistream.h" @@ -410,6 +298,37 @@ static swig_type_info *swig_types[11]; #include "IEHtmlWin.h" static const wxString wxPyPanelNameStr(wxPanelNameStr); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + #ifdef __cplusplus extern "C" { #endif @@ -418,11 +337,25 @@ static PyObject *_wrap_new_MSHTMLEvent(PyObject *self, PyObject *args, PyObject wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxMSHTMLEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_MSHTMLEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MSHTMLEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMSHTMLEvent *)new wxMSHTMLEvent(arg1,arg2); @@ -486,7 +419,7 @@ static PyObject *_wrap_MSHTMLEvent_GetLong1(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -511,7 +444,7 @@ static PyObject *_wrap_MSHTMLEvent_GetLong2(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -541,15 +474,23 @@ static PyObject *_wrap_new_IEHtmlWin(PyObject *self, PyObject *args, PyObject *k 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 *)"O|iOOlO:new_IEHtmlWin",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_IEHtmlWin",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -562,6 +503,12 @@ static PyObject *_wrap_new_IEHtmlWin(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -657,7 +604,7 @@ static PyObject *_wrap_IEHtmlWin_LoadString(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -700,7 +647,7 @@ static PyObject *_wrap_IEHtmlWin_LoadStream(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (created2) delete arg2; @@ -760,7 +707,7 @@ static PyObject *_wrap_IEHtmlWin_SetEditMode(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IEHtmlWin_SetEditMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIEHtmlWin,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -795,7 +742,7 @@ static PyObject *_wrap_IEHtmlWin_GetEditMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -817,7 +764,7 @@ static PyObject *_wrap_IEHtmlWin_GetStringSelection(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIEHtmlWin,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -856,7 +803,7 @@ static PyObject *_wrap_IEHtmlWin_GetText(PyObject *self, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIEHtmlWin,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -898,7 +845,7 @@ static PyObject *_wrap_IEHtmlWin_GoBack(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -923,7 +870,7 @@ static PyObject *_wrap_IEHtmlWin_GoForward(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -948,7 +895,7 @@ static PyObject *_wrap_IEHtmlWin_GoHome(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -973,7 +920,7 @@ static PyObject *_wrap_IEHtmlWin_GoSearch(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -986,12 +933,17 @@ static PyObject *_wrap_IEHtmlWin_RefreshPage(PyObject *self, PyObject *args, PyO int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "level", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IEHtmlWin_RefreshPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IEHtmlWin_RefreshPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIEHtmlWin,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxIEHtmlRefreshLevel) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Refresh((wxIEHtmlRefreshLevel )arg2); @@ -999,7 +951,7 @@ static PyObject *_wrap_IEHtmlWin_RefreshPage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1024,7 +976,7 @@ static PyObject *_wrap_IEHtmlWin_Stop(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1474,6 +1426,7 @@ static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0 static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxMSHTMLEvent", _p_wxMSHTMLEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxMSHTMLEvent", _p_wxMSHTMLEventTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxIEHtmlWin", _p_wxIEHtmlWinTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_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_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_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_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxIEHtmlWin", _p_wxIEHtmlWinTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0},{"_p_wxMSHTMLEvent", _p_wxMSHTMLEventTo_p_wxNotifyEvent},{"_p_wxNotifyEvent"},{0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxMSHTMLEvent", _p_wxMSHTMLEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{0}}; @@ -1486,6 +1439,7 @@ _swigt__p_wxWindow, _swigt__p_wxEvent, _swigt__p_wxObject, _swigt__p_wxEvtHandler, +_swigt__p_char, _swigt__p_wxString, _swigt__p_wxNotifyEvent, _swigt__p_wxCommandEvent, @@ -1497,16 +1451,6 @@ _swigt__p_wxInputStream, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2", (long) wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MSHTML_NEWWINDOW2", (long) wxEVT_COMMAND_MSHTML_NEWWINDOW2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE", (long) wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MSHTML_PROGRESSCHANGE", (long) wxEVT_COMMAND_MSHTML_PROGRESSCHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE", (long) wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MSHTML_TITLECHANGE", (long) wxEVT_COMMAND_MSHTML_TITLECHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IEHTML_REFRESH_NORMAL", (long) wxIEHTML_REFRESH_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IEHTML_REFRESH_IFEXPIRED", (long) wxIEHTML_REFRESH_IFEXPIRED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IEHTML_REFRESH_CONTINUE", (long) wxIEHTML_REFRESH_CONTINUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IEHTML_REFRESH_COMPLETELY", (long) wxIEHTML_REFRESH_COMPLETELY, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -1533,5 +1477,15 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2", SWIG_PyObj_FromInt((int)wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2)); + PyDict_SetItemString(d,"wxEVT_COMMAND_MSHTML_NEWWINDOW2", SWIG_PyObj_FromInt((int)wxEVT_COMMAND_MSHTML_NEWWINDOW2)); + PyDict_SetItemString(d,"wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE", SWIG_PyObj_FromInt((int)wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE)); + PyDict_SetItemString(d,"wxEVT_COMMAND_MSHTML_PROGRESSCHANGE", SWIG_PyObj_FromInt((int)wxEVT_COMMAND_MSHTML_PROGRESSCHANGE)); + PyDict_SetItemString(d,"wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE", SWIG_PyObj_FromInt((int)wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE)); + PyDict_SetItemString(d,"wxEVT_COMMAND_MSHTML_TITLECHANGE", SWIG_PyObj_FromInt((int)wxEVT_COMMAND_MSHTML_TITLECHANGE)); + PyDict_SetItemString(d,"IEHTML_REFRESH_NORMAL", SWIG_PyObj_FromInt((int)wxIEHTML_REFRESH_NORMAL)); + PyDict_SetItemString(d,"IEHTML_REFRESH_IFEXPIRED", SWIG_PyObj_FromInt((int)wxIEHTML_REFRESH_IFEXPIRED)); + PyDict_SetItemString(d,"IEHTML_REFRESH_CONTINUE", SWIG_PyObj_FromInt((int)wxIEHTML_REFRESH_CONTINUE)); + PyDict_SetItemString(d,"IEHTML_REFRESH_COMPLETELY", SWIG_PyObj_FromInt((int)wxIEHTML_REFRESH_COMPLETELY)); } diff --git a/wxPython/contrib/ogl/mac/ogl_wrap.cpp b/wxPython/contrib/ogl/mac/ogl_wrap.cpp index 294b11dfcb..88bd5d9b71 100644 --- a/wxPython/contrib/ogl/mac/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/mac/ogl_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -389,40 +238,41 @@ 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_char swig_types[8] +#define SWIGTYPE_p_wxStringList swig_types[9] +#define SWIGTYPE_p_wxPanel swig_types[10] +#define SWIGTYPE_p_bool swig_types[11] +#define SWIGTYPE_p_wxList swig_types[12] +#define SWIGTYPE_p_wxFont swig_types[13] +#define SWIGTYPE_p_wxScrolledWindow swig_types[14] +#define SWIGTYPE_p_wxWindow swig_types[15] +#define SWIGTYPE_p_double swig_types[16] #define SWIGTYPE_p_wxPyDrawnShape swig_types[17] -#define SWIGTYPE_p_wxPyPolygonShape swig_types[18] -#define SWIGTYPE_p_wxBitmap swig_types[19] -#define SWIGTYPE_p_wxObject swig_types[20] -#define SWIGTYPE_p_wxPyBitmapShape swig_types[21] -#define SWIGTYPE_p_wxString swig_types[22] -#define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[23] -#define SWIGTYPE_p_wxEvtHandler swig_types[24] -#define SWIGTYPE_p_wxPyEllipseShape swig_types[25] -#define SWIGTYPE_p_wxPyShapeCanvas swig_types[26] -#define SWIGTYPE_p_wxPoint swig_types[27] -#define SWIGTYPE_p_wxDiagram swig_types[28] -#define SWIGTYPE_p_wxPyShape swig_types[29] -#define SWIGTYPE_p_wxAttachmentPoint swig_types[30] -#define SWIGTYPE_p_wxClassInfo swig_types[31] -#define SWIGTYPE_p_wxPyLineShape swig_types[32] -#define SWIGTYPE_p_wxPyRectangleShape swig_types[33] -#define SWIGTYPE_p_wxPyCompositeShape swig_types[34] -#define SWIGTYPE_p_wxPyCircleShape swig_types[35] -#define SWIGTYPE_p_wxPen swig_types[36] -#define SWIGTYPE_p_int swig_types[37] -#define SWIGTYPE_p_wxPseudoMetaFile swig_types[38] -#define SWIGTYPE_p_wxPyTextShape swig_types[39] -#define SWIGTYPE_p_wxPyDividedShape swig_types[40] -static swig_type_info *swig_types[42]; +#define SWIGTYPE_p_wxPyDivisionShape swig_types[18] +#define SWIGTYPE_p_wxPyPolygonShape swig_types[19] +#define SWIGTYPE_p_wxBitmap swig_types[20] +#define SWIGTYPE_p_wxObject swig_types[21] +#define SWIGTYPE_p_wxPyBitmapShape swig_types[22] +#define SWIGTYPE_p_wxString swig_types[23] +#define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[24] +#define SWIGTYPE_p_wxEvtHandler swig_types[25] +#define SWIGTYPE_p_wxPyEllipseShape swig_types[26] +#define SWIGTYPE_p_wxPyShapeCanvas swig_types[27] +#define SWIGTYPE_p_wxPoint swig_types[28] +#define SWIGTYPE_p_wxDiagram swig_types[29] +#define SWIGTYPE_p_wxPyShape swig_types[30] +#define SWIGTYPE_p_wxAttachmentPoint swig_types[31] +#define SWIGTYPE_p_wxClassInfo swig_types[32] +#define SWIGTYPE_p_wxPyLineShape swig_types[33] +#define SWIGTYPE_p_wxPyRectangleShape swig_types[34] +#define SWIGTYPE_p_wxPyCompositeShape swig_types[35] +#define SWIGTYPE_p_wxPyCircleShape swig_types[36] +#define SWIGTYPE_p_wxPen swig_types[37] +#define SWIGTYPE_p_int swig_types[38] +#define SWIGTYPE_p_wxPseudoMetaFile swig_types[39] +#define SWIGTYPE_p_wxPyTextShape swig_types[40] +#define SWIGTYPE_p_wxPyDividedShape swig_types[41] +static swig_type_info *swig_types[43]; /* -------- TYPES TABLE (END) -------- */ @@ -434,6 +284,44 @@ static swig_type_info *swig_types[42]; #define SWIG_name "_ogl" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "oglhelpers.h" @@ -441,6 +329,30 @@ static swig_type_info *swig_types[42]; static const wxString wxPyEmptyString(wxEmptyString); +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -474,6 +386,22 @@ void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape); PyObject *wxPyShape_GetChildren(wxPyShape *self){ @@ -484,6 +412,13 @@ PyObject *wxPyShape_GetLines(wxPyShape *self){ wxList& list = self->GetLines(); return wxPy_ConvertShapeList(&list); } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + PyObject *wxPyShape_GetRegions(wxPyShape *self){ wxList& list = self->GetRegions(); return wxPy_ConvertList(&list); @@ -927,12 +862,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinSize(arg2,arg3); @@ -953,12 +898,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -979,12 +934,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2,arg3); @@ -1005,12 +970,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetProportions",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetProportions(arg2,arg3); @@ -1030,12 +1005,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFormatMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFormatMode(arg2); @@ -1356,7 +1336,7 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1531,7 +1511,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1543,12 +1523,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPenStyle(arg2); @@ -1646,7 +1631,7 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1671,7 +1656,7 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1715,11 +1700,32 @@ 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_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxAttachmentPoint *)new wxAttachmentPoint(arg1,arg2,arg3); @@ -1739,12 +1745,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_id_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_id = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1767,7 +1778,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args, 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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1779,12 +1790,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1807,7 +1823,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, P 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_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1819,12 +1835,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1847,7 +1868,7 @@ static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, P 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_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -2191,7 +2212,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2337,12 +2358,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -2365,12 +2410,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -2393,12 +2462,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -2419,17 +2512,27 @@ 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(!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; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnSize(arg2,arg3); - - wxPyEndAllowThreads(__tstate); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->base_OnSize(arg2,arg3); + + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; @@ -2451,20 +2554,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -2475,7 +2598,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2493,20 +2616,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -2534,16 +2677,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -2566,12 +2733,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -2594,12 +2785,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -2624,16 +2839,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -2656,12 +2895,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -2684,12 +2947,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -2714,16 +3001,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -2818,7 +3125,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2848,17 +3155,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -2883,13 +3214,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -2914,13 +3269,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -2941,12 +3320,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -2967,12 +3356,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -3142,14 +3541,34 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, double temp6 ; double temp7 ; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL }; arg6 = &temp6; arg7 = &temp7; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odddd:PyShape_GetPerimeterPoint",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetPerimeterPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetPerimeterPoint(arg2,arg3,arg4,arg5,arg6,arg7); @@ -3157,7 +3576,7 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyFloat_FromDouble((double) (*arg6)); resultobj = t_output_helper(resultobj,o); @@ -3330,7 +3749,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_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -3355,7 +3774,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_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -3367,12 +3786,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetX(arg2); @@ -3392,12 +3816,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetY(arg2); @@ -3555,7 +3984,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3590,7 +4019,7 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3794,7 +4223,7 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3841,7 +4270,7 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -3878,13 +4307,13 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -3920,7 +4349,7 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3945,7 +4374,7 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3970,7 +4399,7 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3983,16 +4412,23 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4028,7 +4464,7 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4050,12 +4486,12 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4088,11 +4524,11 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4165,7 +4601,7 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4190,7 +4626,7 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4210,7 +4646,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4245,7 +4681,7 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4258,16 +4694,21 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetShadowMode",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4303,7 +4744,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4321,14 +4762,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_HitTest",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->HitTest(arg2,arg3,arg4,arg5); @@ -4336,7 +4787,7 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg4)); resultobj = t_output_helper(resultobj,o); @@ -4364,7 +4815,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4399,7 +4850,7 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4419,7 +4870,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4454,7 +4905,7 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4499,7 +4950,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4534,7 +4985,7 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4546,12 +4997,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetAttachmentMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentMode(arg2); @@ -4584,7 +5040,7 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4596,12 +5052,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -4634,7 +5095,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_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4740,7 +5201,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4775,7 +5236,7 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4791,20 +5252,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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } } @@ -5003,16 +5474,26 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_SetSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -5036,12 +5517,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetAttachmentSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentSize(arg2,arg3); @@ -5125,7 +5616,7 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5144,14 +5635,42 @@ 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(!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_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddLine(arg2,arg3,arg4,arg5,arg6,arg7); @@ -5187,7 +5706,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5318,11 +5837,12 @@ 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(!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) { @@ -5333,6 +5853,12 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FormatText(*arg2,(wxString const &)*arg3,arg4); @@ -5361,12 +5887,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFormatMode",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFormatMode(arg2,arg3); @@ -5387,12 +5925,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetFormatMode(arg2); @@ -5400,7 +5945,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5414,11 +5959,12 @@ 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(!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; @@ -5442,6 +5988,12 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject else arg2 = NULL; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFont(arg2,arg3); @@ -5462,12 +6014,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFont *)(arg1)->GetFont(arg2); @@ -5490,17 +6049,24 @@ 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(!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_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTextColour((wxString const &)*arg2,arg3); @@ -5529,12 +6095,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetTextColour(arg2); @@ -5573,7 +6146,7 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5588,17 +6161,24 @@ 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(!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_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRegionName((wxString const &)*arg2,arg3); @@ -5627,12 +6207,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionName",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetRegionName(arg2); @@ -5679,7 +6264,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_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -5922,12 +6507,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearText(arg2); @@ -5982,6 +6574,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,8 +6584,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPosition",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -6001,7 +6612,7 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6034,7 +6645,7 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6047,12 +6658,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AttachmentIsValid",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AttachmentIsValid(arg2); @@ -6060,7 +6676,7 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6105,6 +6721,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,8 +6731,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -6124,7 +6759,7 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6153,12 +6788,14 @@ 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(!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; @@ -6168,6 +6805,14 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6197,14 +6842,19 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_AttachmentSortTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; @@ -6220,7 +6870,7 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6235,20 +6885,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_EraseLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6274,20 +6931,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_DrawLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6316,17 +6980,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_MoveLineToNewAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->MoveLineToNewAttachment(*arg2,arg3,arg4,arg5); @@ -6334,7 +7008,7 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6374,12 +7048,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBranchingAttachmentRoot(arg2); @@ -6412,6 +7091,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 +7100,12 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; @@ -6445,7 +7129,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6463,14 +7147,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxRealPoint_helper(obj3, &arg4)) SWIG_fail; @@ -6486,7 +7180,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6499,12 +7193,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetAttachmentLineCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAttachmentLineCount(arg2); @@ -6512,7 +7211,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6524,12 +7223,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchNeckLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchNeckLength(arg2); @@ -6562,7 +7266,7 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6574,14 +7278,19 @@ 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(!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; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchStemLength(arg2); wxPyEndAllowThreads(__tstate); @@ -6612,7 +7321,7 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6624,12 +7333,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchSpacing(arg2); @@ -6662,7 +7376,7 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6674,12 +7388,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchStyle(arg2); @@ -6712,7 +7431,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_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -6725,12 +7444,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->PhysicalToLogicalAttachment(arg2); @@ -6738,7 +7462,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6751,12 +7475,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->LogicalToPhysicalAttachment(arg2); @@ -6764,7 +7493,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6789,7 +7518,7 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6817,7 +7546,7 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6841,13 +7570,13 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6934,12 +7663,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -6972,7 +7716,7 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -6984,12 +7728,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetRotation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRotation(arg2); @@ -7250,7 +7999,7 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7396,12 +8145,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -7424,12 +8197,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -7452,12 +8249,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -7478,12 +8299,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -7510,20 +8341,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -7534,7 +8385,7 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7552,20 +8403,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -7593,16 +8464,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -7625,12 +8520,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -7653,12 +8572,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -7683,16 +8626,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -7715,12 +8682,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -7743,12 +8734,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -7773,16 +8788,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -7877,7 +8912,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7907,17 +8942,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -7942,13 +9001,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -7973,13 +9056,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -8000,12 +9107,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -8026,12 +9143,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -8109,16 +9236,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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Draw(*arg2,arg3,arg4); @@ -8193,12 +9330,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scale(arg2,arg3); @@ -8219,12 +9366,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_ScaleTo",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ScaleTo(arg2,arg3); @@ -8245,12 +9402,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Translate(arg2,arg3); @@ -8272,12 +9439,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -8324,7 +9506,7 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8415,7 +9597,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8450,7 +9632,7 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8463,12 +9645,22 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(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_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -8624,12 +9816,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOutlineOp(arg2); @@ -8662,7 +9859,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8687,7 +9884,7 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8771,16 +9968,21 @@ 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(!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_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -8849,16 +10051,26 @@ 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(!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_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4); @@ -8988,13 +10200,18 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args, int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PseudoMetaFile_DrawLines",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9017,14 +10234,26 @@ 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 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|i:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4); @@ -9045,13 +10274,18 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args, int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9156,7 +10390,7 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -9206,7 +10440,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -9339,12 +10573,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBackgroundMode(arg2); @@ -9371,11 +10610,25 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyRectangleShape *result; + 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyRectangleShape *)new wxPyRectangleShape(arg1,arg2); @@ -9425,12 +10678,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCornerRadius(arg2); @@ -9463,7 +10721,7 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -9574,7 +10832,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -9720,12 +10978,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -9748,12 +11030,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -9776,38 +11082,72 @@ 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(!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; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ; 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -9834,20 +11174,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -9858,7 +11218,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9876,20 +11236,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -9917,16 +11297,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -9949,12 +11353,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -9977,12 +11405,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -10007,16 +11459,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -10039,12 +11515,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -10067,12 +11567,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -10097,16 +11621,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -10201,7 +11745,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10231,17 +11775,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -10266,13 +11834,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -10297,13 +11889,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -10324,12 +11940,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -10350,12 +11976,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -10388,17 +12024,45 @@ 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 (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyControlPoint *)new wxPyControlPoint(arg1,arg2,arg3,arg4,arg5,arg6); @@ -10448,12 +12112,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCornerRadius(arg2); @@ -10572,7 +12241,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10718,12 +12387,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -10746,12 +12439,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -10774,12 +12491,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -10800,12 +12541,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -10832,20 +12583,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -10856,7 +12627,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10874,20 +12645,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -10915,16 +12706,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -10947,12 +12762,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -10975,12 +12814,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -11005,16 +12868,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -11037,12 +12924,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -11065,12 +12976,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -11095,16 +13030,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -11199,7 +13154,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject * } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -11229,17 +13184,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -11264,13 +13243,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -11295,13 +13298,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -11322,12 +13349,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -11348,12 +13385,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -11660,7 +13707,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -11806,12 +13853,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -11834,12 +13905,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -11862,12 +13957,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -11888,12 +14007,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -11920,20 +14049,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -11944,7 +14093,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11962,20 +14111,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -12003,16 +14172,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -12035,12 +14228,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -12063,12 +14280,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -12093,16 +14334,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -12125,12 +14390,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -12153,12 +14442,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -12183,16 +14496,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -12287,7 +14620,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -12317,17 +14650,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -12352,13 +14709,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -12383,13 +14764,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -12410,12 +14815,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -12436,12 +14851,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -12613,12 +15038,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawAtAngle(arg2); @@ -12642,16 +15072,26 @@ 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(!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_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4); @@ -12710,13 +15150,18 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, Py int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyDrawnShape_DrawLines",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12770,14 +15215,26 @@ 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 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|i:PyDrawnShape_DrawPolygon",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4); @@ -12831,16 +15288,21 @@ 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(!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_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -12861,13 +15323,18 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, P int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyDrawnShape_DrawSpline",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12948,7 +15415,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13001,7 +15468,7 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -13034,7 +15501,7 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -13056,12 +15523,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -13143,12 +15625,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDrawnBackgroundMode(arg2); @@ -13195,7 +15682,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -13295,7 +15782,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args, } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -13350,12 +15837,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scale(arg2,arg3); @@ -13383,7 +15880,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13406,12 +15903,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Translate(arg2,arg3); @@ -13530,7 +16037,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -13676,12 +16183,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -13704,12 +16235,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -13732,12 +16287,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -13758,12 +16337,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -13790,20 +16379,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -13814,7 +16423,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13832,20 +16441,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -13873,16 +16502,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -13905,12 +16558,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -13933,12 +16610,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -13963,16 +16664,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -13995,12 +16720,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -14023,12 +16772,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -14053,16 +16826,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -14157,7 +16950,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -14187,17 +16980,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -14222,13 +17039,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -14253,13 +17094,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -14280,12 +17145,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -14306,12 +17181,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -14339,13 +17224,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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg3 = obj2; { @@ -14382,7 +17272,7 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14395,12 +17285,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_SetSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2,arg3); @@ -14422,12 +17322,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_Equals",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Equals(arg2,arg3); @@ -14435,7 +17345,7 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14571,14 +17481,19 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg4 = obj3; { @@ -14605,14 +17520,19 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -14676,7 +17596,7 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14856,7 +17776,7 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14994,7 +17914,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -15140,12 +18060,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -15168,12 +18112,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -15196,12 +18164,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -15222,12 +18214,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -15254,20 +18256,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -15278,7 +18300,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15296,20 +18318,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -15337,16 +18379,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -15369,12 +18435,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -15397,12 +18487,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -15427,16 +18541,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -15459,12 +18597,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -15487,12 +18649,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -15517,16 +18703,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -15621,7 +18827,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -15651,17 +18857,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -15686,13 +18916,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -15717,13 +18971,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -15744,12 +19022,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -15770,12 +19058,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -15802,11 +19100,25 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyDividedShape *result; + 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyDividedShape *)new wxPyDividedShape(arg1,arg2); @@ -16003,7 +19315,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -16149,12 +19461,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -16177,12 +19513,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -16205,12 +19565,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -16231,12 +19615,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -16263,20 +19657,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -16287,7 +19701,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16305,20 +19719,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -16346,16 +19780,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -16378,12 +19836,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -16406,12 +19888,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -16436,16 +19942,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -16468,12 +19998,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -16496,12 +20050,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -16526,16 +20104,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -16630,7 +20228,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject * } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -16660,17 +20258,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -16695,13 +20317,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -16726,13 +20372,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -16753,12 +20423,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -16779,12 +20459,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -16866,15 +20556,20 @@ 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(!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; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16897,15 +20592,20 @@ 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(!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; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16928,15 +20628,20 @@ 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(!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; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16959,15 +20664,20 @@ 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(!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; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16989,12 +20699,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_Divide",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Divide(arg2); @@ -17014,12 +20729,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_EditEdge",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EditEdge(arg2); @@ -17079,7 +20799,7 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17255,15 +20975,25 @@ 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(!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; { - arg4 = (bool) SPyObj_AsBool(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -17286,12 +21016,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopupMenu(arg2,arg3); @@ -17338,12 +21078,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetHandleSide",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandleSide(arg2); @@ -17711,7 +21456,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -17857,12 +21602,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -17885,12 +21654,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -17913,12 +21706,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -17939,12 +21756,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -17971,20 +21798,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -17995,7 +21842,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18013,20 +21860,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -18054,16 +21921,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -18086,12 +21977,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -18114,12 +22029,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -18144,16 +22083,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -18176,12 +22139,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -18204,12 +22191,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -18234,16 +22245,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -18338,7 +22369,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -18368,17 +22399,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -18403,13 +22458,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -18434,13 +22513,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -18461,12 +22564,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -18487,12 +22600,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -18519,11 +22642,25 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyEllipseShape *result; + 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyEllipseShape *)new wxPyEllipseShape(arg1,arg2); @@ -18648,7 +22785,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -18794,12 +22931,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -18822,12 +22983,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -18850,12 +23035,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -18876,12 +23085,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -18908,20 +23127,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -18932,7 +23171,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18950,20 +23189,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -18991,16 +23250,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19023,12 +23306,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -19051,12 +23358,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -19081,16 +23412,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -19113,12 +23468,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -19141,12 +23520,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -19171,16 +23574,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -19275,7 +23698,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject * } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -19305,17 +23728,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -19340,13 +23787,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19371,13 +23842,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19398,12 +23893,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -19424,12 +23929,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -19455,11 +23970,18 @@ 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyCircleShape *)new wxPyCircleShape(arg1); @@ -19584,7 +24106,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -19730,12 +24252,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -19758,12 +24304,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -19786,12 +24356,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -19812,12 +24406,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -19844,20 +24448,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -19868,7 +24492,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19886,20 +24510,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -19927,16 +24571,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19959,12 +24627,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -19987,12 +24679,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -20017,16 +24733,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -20049,12 +24789,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -20077,12 +24841,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -20107,16 +24895,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -20211,7 +25019,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -20241,17 +25049,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -20276,13 +25108,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -20307,13 +25163,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -20334,12 +25214,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -20360,12 +25250,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -20399,13 +25299,42 @@ 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_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = wxString_in_helper(obj4); @@ -20416,6 +25345,12 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxArrowHead *)new wxArrowHead(arg1,arg2,arg3,arg4,(wxString const &)*arg5,arg6,arg7); @@ -20482,7 +25417,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20507,7 +25442,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20519,12 +25454,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -20557,7 +25497,7 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20582,7 +25522,7 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20607,7 +25547,7 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20632,7 +25572,7 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20675,12 +25615,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetXOffset",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetXOffset(arg2); @@ -20700,12 +25645,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetYOffset",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetYOffset(arg2); @@ -20765,7 +25715,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_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -20790,7 +25740,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20815,7 +25765,7 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20827,12 +25777,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2); @@ -20852,12 +25807,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2); @@ -20944,14 +25904,41 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:PyLineShape_AddArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -20962,6 +25949,12 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj7) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddArrow(arg2,arg3,arg4,arg5,(wxString const &)*arg6,arg7,arg8); @@ -20993,14 +25986,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(!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_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyLineShape_AddArrowOrdered(arg1,arg2,arg3,arg4); @@ -21041,7 +26039,7 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -21061,12 +26059,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearArrowsAtPosition(arg2); @@ -21091,12 +26096,13 @@ 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(!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) { @@ -21104,7 +26110,11 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg5 = (bool) SPyObj_AsBool(obj4); + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21127,12 +26137,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteArrowHead(arg2); @@ -21140,7 +26155,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21155,13 +26170,18 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -21174,7 +26194,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -21207,7 +26227,7 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21254,17 +26274,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRegion(*arg2,arg3,arg4,arg5); @@ -21289,17 +26319,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_EraseRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EraseRegion(*arg2,arg3,arg4,arg5); @@ -21320,12 +26360,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_FindArrowHeadId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxArrowHead *)(arg1)->FindArrowHead(arg2); @@ -21350,13 +26395,18 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -21445,12 +26495,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindLinePosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->FindLinePosition(arg2,arg3); @@ -21458,7 +26518,7 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21483,7 +26543,7 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -21512,7 +26572,7 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj 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); + arg5 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -21555,7 +26615,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21580,7 +26640,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21675,14 +26735,19 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetLabelPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetLabelPosition(arg2,arg3,arg4); @@ -21832,7 +26897,7 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21857,7 +26922,7 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21869,12 +26934,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeLineControlPoints(arg2); @@ -21919,12 +26989,17 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *a 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentFrom(arg2); @@ -21945,12 +27020,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAttachments",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachments(arg2,arg3); @@ -21970,12 +27055,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentTo",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentTo(arg2); @@ -21998,12 +27088,32 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_SetEnds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEnds(arg2,arg3,arg4,arg5); @@ -22058,7 +27168,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22088,7 +27198,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22200,11 +27310,11 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -22228,14 +27338,19 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -22266,7 +27381,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22276,7 +27391,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22297,7 +27412,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22307,7 +27422,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22332,7 +27447,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22357,7 +27472,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22444,7 +27559,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22590,12 +27705,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -22618,12 +27757,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -22646,12 +27809,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -22672,12 +27859,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -22704,20 +27901,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -22728,7 +27945,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22746,20 +27963,40 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -22787,16 +28024,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -22819,12 +28080,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -22847,12 +28132,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -22877,16 +28186,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -22909,12 +28242,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -22937,12 +28294,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -22967,16 +28348,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -23071,7 +28472,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -23101,17 +28502,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -23136,13 +28561,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -23167,13 +28616,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -23194,12 +28667,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -23220,12 +28703,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -23332,12 +28825,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddPolygonPoint(arg2); @@ -23381,12 +28881,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeletePolygonPoint(arg2); @@ -23469,7 +28976,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -23494,7 +29001,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -23506,12 +29013,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOriginalWidth(arg2); @@ -23531,12 +29043,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOriginalHeight(arg2); @@ -23655,7 +29172,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -23801,12 +29318,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -23829,12 +29370,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -23857,12 +29422,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -23883,12 +29472,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -23915,20 +29514,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -23939,7 +29558,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23957,20 +29576,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -23998,16 +29637,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24030,12 +29693,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -24058,12 +29745,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -24088,16 +29799,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -24120,12 +29855,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -24148,12 +29907,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -24178,16 +29961,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -24282,7 +30085,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject * } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -24312,17 +30115,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -24347,13 +30174,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24378,13 +30229,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24405,12 +30280,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -24431,12 +30316,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -24463,11 +30358,25 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyTextShape *result; + 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyTextShape *)new wxPyTextShape(arg1,arg2); @@ -24616,7 +30525,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -24762,12 +30671,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -24790,12 +30723,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -24818,12 +30775,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -24844,12 +30825,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -24876,20 +30867,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -24900,7 +30911,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24918,20 +30929,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -24959,16 +30990,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24991,12 +31046,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -25019,12 +31098,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -25049,16 +31152,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -25081,12 +31208,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -25109,12 +31260,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -25139,16 +31314,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -25243,7 +31438,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -25273,17 +31468,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -25308,13 +31527,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -25339,13 +31582,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -25366,12 +31633,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -25392,12 +31669,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -25539,16 +31826,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -25569,12 +31876,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_FindShape",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindShape(arg2); @@ -25636,7 +31948,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -25661,7 +31973,7 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -25686,7 +31998,7 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -25736,7 +32048,7 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25761,7 +32073,7 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25938,12 +32250,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetGridSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetGridSpacing(arg2); @@ -25963,12 +32280,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetMouseTolerance",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMouseTolerance(arg2); @@ -25996,7 +32318,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -26026,7 +32348,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -26056,7 +32378,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -26144,17 +32466,25 @@ 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 (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -26167,6 +32497,12 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -26271,6 +32607,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,8 +32616,16 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxClassInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -26316,13 +32662,28 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindFirstSensitiveShape(arg2,arg3,arg4,arg5); @@ -26388,7 +32749,7 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26429,12 +32790,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4); @@ -26456,12 +32834,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4); @@ -26483,12 +32878,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4); @@ -26510,12 +32922,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4); @@ -26539,16 +32968,33 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5); @@ -26572,16 +33018,33 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5); @@ -26603,12 +33066,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4); @@ -26630,12 +33110,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4); @@ -28591,6 +35088,7 @@ static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC" static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0},{"_p_wxRealPoint"},{0}}; static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, "wxPyControlPoint *", 0},{"_p_wxPyControlPoint"},{0}}; static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0},{"_p_wxArrowHead"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0},{"_p_wxStringList"},{0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0},{"_p_bool"},{0}}; @@ -28599,8 +35097,8 @@ static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}}; -static swig_type_info _swigt__p_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_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0},{"_p_wxPyDivisionShape"},{0}}; static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0},{"_p_wxPyPolygonShape"},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject},{0}}; @@ -28634,6 +35132,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, @@ -28642,8 +35141,8 @@ _swigt__p_wxFont, _swigt__p_wxScrolledWindow, _swigt__p_wxWindow, _swigt__p_double, -_swigt__p_wxPyDivisionShape, _swigt__p_wxPyDrawnShape, +_swigt__p_wxPyDivisionShape, _swigt__p_wxPyPolygonShape, _swigt__p_wxBitmap, _swigt__p_wxObject, @@ -28674,70 +35173,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 +35199,70 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_PyObj_FromInt((int)oglMETAFLAGS_OUTLINE)); + PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_PyObj_FromInt((int)oglMETAFLAGS_ATTACHMENTS)); + PyDict_SetItemString(d,"KEY_SHIFT", SWIG_PyObj_FromInt((int)KEY_SHIFT)); + PyDict_SetItemString(d,"KEY_CTRL", SWIG_PyObj_FromInt((int)KEY_CTRL)); + PyDict_SetItemString(d,"ARROW_NONE", SWIG_PyObj_FromInt((int)ARROW_NONE)); + PyDict_SetItemString(d,"ARROW_END", SWIG_PyObj_FromInt((int)ARROW_END)); + PyDict_SetItemString(d,"ARROW_BOTH", SWIG_PyObj_FromInt((int)ARROW_BOTH)); + PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_PyObj_FromInt((int)ARROW_MIDDLE)); + PyDict_SetItemString(d,"ARROW_START", SWIG_PyObj_FromInt((int)ARROW_START)); + PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_HOLLOW_CIRCLE)); + PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_FILLED_CIRCLE)); + PyDict_SetItemString(d,"ARROW_ARROW", SWIG_PyObj_FromInt((int)ARROW_ARROW)); + PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_SINGLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_DOUBLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_PyObj_FromInt((int)ARROW_METAFILE)); + PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_PyObj_FromInt((int)ARROW_POSITION_END)); + PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_PyObj_FromInt((int)ARROW_POSITION_START)); + PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_VERTICAL)); + PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_HORIZONTAL)); + PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_DIAGONAL)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_TO)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_FROM)); + PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_PyObj_FromInt((int)CONTROL_POINT_LINE)); + PyDict_SetItemString(d,"FORMAT_NONE", SWIG_PyObj_FromInt((int)FORMAT_NONE)); + PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_HORIZ)); + PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_VERT)); + PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_PyObj_FromInt((int)FORMAT_SIZE_TO_CONTENTS)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_HORIZ)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_VERT)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_NONE)); + PyDict_SetItemString(d,"SHADOW_NONE", SWIG_PyObj_FromInt((int)SHADOW_NONE)); + PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_PyObj_FromInt((int)SHADOW_LEFT)); + PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_PyObj_FromInt((int)SHADOW_RIGHT)); + PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_PyObj_FromInt((int)OP_CLICK_LEFT)); + PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_PyObj_FromInt((int)OP_CLICK_RIGHT)); + PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_PyObj_FromInt((int)OP_DRAG_LEFT)); + PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_PyObj_FromInt((int)OP_DRAG_RIGHT)); + PyDict_SetItemString(d,"OP_ALL", SWIG_PyObj_FromInt((int)OP_ALL)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_NONE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_EDGE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_BRANCHING)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_NORMAL)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_BLOB)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_BOTH)); + PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_LEFT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_RIGHT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ABOVE)); + PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_PyObj_FromInt((int)gyCONSTRAINT_BELOW)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_PyObj_FromInt((int)DIVISION_SIDE_NONE)); + PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_LEFT)); + PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_PyObj_FromInt((int)DIVISION_SIDE_TOP)); + PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_PyObj_FromInt((int)DIVISION_SIDE_BOTTOM)); // initoglbasicc(); diff --git a/wxPython/contrib/ogl/msw/ogl_wrap.cpp b/wxPython/contrib/ogl/msw/ogl_wrap.cpp index d3fa2c8cba..c78e9eaf7a 100644 --- a/wxPython/contrib/ogl/msw/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/msw/ogl_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -389,40 +238,41 @@ 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_char swig_types[8] +#define SWIGTYPE_p_wxStringList swig_types[9] +#define SWIGTYPE_p_wxPanel swig_types[10] +#define SWIGTYPE_p_bool swig_types[11] +#define SWIGTYPE_p_wxList swig_types[12] +#define SWIGTYPE_p_wxFont swig_types[13] +#define SWIGTYPE_p_wxScrolledWindow swig_types[14] +#define SWIGTYPE_p_wxWindow swig_types[15] +#define SWIGTYPE_p_double swig_types[16] #define SWIGTYPE_p_wxPyDrawnShape swig_types[17] -#define SWIGTYPE_p_wxPyPolygonShape swig_types[18] -#define SWIGTYPE_p_wxBitmap swig_types[19] -#define SWIGTYPE_p_wxObject swig_types[20] -#define SWIGTYPE_p_wxPyBitmapShape swig_types[21] -#define SWIGTYPE_p_wxString swig_types[22] -#define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[23] -#define SWIGTYPE_p_wxEvtHandler swig_types[24] -#define SWIGTYPE_p_wxPyEllipseShape swig_types[25] -#define SWIGTYPE_p_wxPyShapeCanvas swig_types[26] -#define SWIGTYPE_p_wxPoint swig_types[27] -#define SWIGTYPE_p_wxDiagram swig_types[28] -#define SWIGTYPE_p_wxPyShape swig_types[29] -#define SWIGTYPE_p_wxAttachmentPoint swig_types[30] -#define SWIGTYPE_p_wxClassInfo swig_types[31] -#define SWIGTYPE_p_wxPyLineShape swig_types[32] -#define SWIGTYPE_p_wxPyRectangleShape swig_types[33] -#define SWIGTYPE_p_wxPyCompositeShape swig_types[34] -#define SWIGTYPE_p_wxPyCircleShape swig_types[35] -#define SWIGTYPE_p_wxPen swig_types[36] -#define SWIGTYPE_p_int swig_types[37] -#define SWIGTYPE_p_wxPseudoMetaFile swig_types[38] -#define SWIGTYPE_p_wxPyTextShape swig_types[39] -#define SWIGTYPE_p_wxPyDividedShape swig_types[40] -static swig_type_info *swig_types[42]; +#define SWIGTYPE_p_wxPyDivisionShape swig_types[18] +#define SWIGTYPE_p_wxPyPolygonShape swig_types[19] +#define SWIGTYPE_p_wxBitmap swig_types[20] +#define SWIGTYPE_p_wxObject swig_types[21] +#define SWIGTYPE_p_wxPyBitmapShape swig_types[22] +#define SWIGTYPE_p_wxString swig_types[23] +#define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[24] +#define SWIGTYPE_p_wxEvtHandler swig_types[25] +#define SWIGTYPE_p_wxPyEllipseShape swig_types[26] +#define SWIGTYPE_p_wxPyShapeCanvas swig_types[27] +#define SWIGTYPE_p_wxPoint swig_types[28] +#define SWIGTYPE_p_wxDiagram swig_types[29] +#define SWIGTYPE_p_wxPyShape swig_types[30] +#define SWIGTYPE_p_wxAttachmentPoint swig_types[31] +#define SWIGTYPE_p_wxClassInfo swig_types[32] +#define SWIGTYPE_p_wxPyLineShape swig_types[33] +#define SWIGTYPE_p_wxPyRectangleShape swig_types[34] +#define SWIGTYPE_p_wxPyCompositeShape swig_types[35] +#define SWIGTYPE_p_wxPyCircleShape swig_types[36] +#define SWIGTYPE_p_wxPen swig_types[37] +#define SWIGTYPE_p_int swig_types[38] +#define SWIGTYPE_p_wxPseudoMetaFile swig_types[39] +#define SWIGTYPE_p_wxPyTextShape swig_types[40] +#define SWIGTYPE_p_wxPyDividedShape swig_types[41] +static swig_type_info *swig_types[43]; /* -------- TYPES TABLE (END) -------- */ @@ -434,6 +284,44 @@ static swig_type_info *swig_types[42]; #define SWIG_name "_ogl" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "oglhelpers.h" @@ -441,6 +329,30 @@ static swig_type_info *swig_types[42]; static const wxString wxPyEmptyString(wxEmptyString); +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -474,6 +386,22 @@ void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape); PyObject *wxPyShape_GetChildren(wxPyShape *self){ @@ -484,6 +412,13 @@ PyObject *wxPyShape_GetLines(wxPyShape *self){ wxList& list = self->GetLines(); return wxPy_ConvertShapeList(&list); } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + PyObject *wxPyShape_GetRegions(wxPyShape *self){ wxList& list = self->GetRegions(); return wxPy_ConvertList(&list); @@ -927,12 +862,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinSize(arg2,arg3); @@ -953,12 +898,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -979,12 +934,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2,arg3); @@ -1005,12 +970,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetProportions",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetProportions(arg2,arg3); @@ -1030,12 +1005,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFormatMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFormatMode(arg2); @@ -1356,7 +1336,7 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1531,7 +1511,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1543,12 +1523,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPenStyle(arg2); @@ -1646,7 +1631,7 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1671,7 +1656,7 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1715,11 +1700,32 @@ 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_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxAttachmentPoint *)new wxAttachmentPoint(arg1,arg2,arg3); @@ -1739,12 +1745,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_id_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_id = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1767,7 +1778,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args, 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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1779,12 +1790,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1807,7 +1823,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, P 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_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1819,12 +1835,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAttachmentPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1847,7 +1868,7 @@ static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, P 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_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -2191,7 +2212,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2337,12 +2358,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -2365,12 +2410,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -2393,12 +2462,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -2419,17 +2512,27 @@ 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(!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; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnSize(arg2,arg3); - - wxPyEndAllowThreads(__tstate); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->base_OnSize(arg2,arg3); + + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; @@ -2451,20 +2554,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -2475,7 +2598,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2493,20 +2616,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -2534,16 +2677,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -2566,12 +2733,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -2594,12 +2785,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -2624,16 +2839,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -2656,12 +2895,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -2684,12 +2947,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -2714,16 +3001,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -2818,7 +3125,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2848,17 +3155,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -2883,13 +3214,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -2914,13 +3269,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -2941,12 +3320,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -2967,12 +3356,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -3142,14 +3541,34 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, double temp6 ; double temp7 ; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL }; arg6 = &temp6; arg7 = &temp7; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odddd:PyShape_GetPerimeterPoint",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetPerimeterPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetPerimeterPoint(arg2,arg3,arg4,arg5,arg6,arg7); @@ -3157,7 +3576,7 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyFloat_FromDouble((double) (*arg6)); resultobj = t_output_helper(resultobj,o); @@ -3330,7 +3749,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_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -3355,7 +3774,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_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -3367,12 +3786,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetX(arg2); @@ -3392,12 +3816,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetY(arg2); @@ -3555,7 +3984,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3590,7 +4019,7 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3794,7 +4223,7 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3841,7 +4270,7 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -3878,13 +4307,13 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -3920,7 +4349,7 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3945,7 +4374,7 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3970,7 +4399,7 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3983,16 +4412,23 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4028,7 +4464,7 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4050,12 +4486,12 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4088,11 +4524,11 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4165,7 +4601,7 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4190,7 +4626,7 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4210,7 +4646,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4245,7 +4681,7 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4258,16 +4694,21 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetShadowMode",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -4303,7 +4744,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4321,14 +4762,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_HitTest",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->HitTest(arg2,arg3,arg4,arg5); @@ -4336,7 +4787,7 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg4)); resultobj = t_output_helper(resultobj,o); @@ -4364,7 +4815,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4399,7 +4850,7 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4419,7 +4870,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4454,7 +4905,7 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4499,7 +4950,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4534,7 +4985,7 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4546,12 +4997,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetAttachmentMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentMode(arg2); @@ -4584,7 +5040,7 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4596,12 +5052,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -4634,7 +5095,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_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4740,7 +5201,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4775,7 +5236,7 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4791,20 +5252,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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } } @@ -5003,16 +5474,26 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_SetSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -5036,12 +5517,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetAttachmentSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentSize(arg2,arg3); @@ -5125,7 +5616,7 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5144,14 +5635,42 @@ 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(!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_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddLine(arg2,arg3,arg4,arg5,arg6,arg7); @@ -5187,7 +5706,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5318,11 +5837,12 @@ 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(!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) { @@ -5333,6 +5853,12 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FormatText(*arg2,(wxString const &)*arg3,arg4); @@ -5361,12 +5887,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFormatMode",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFormatMode(arg2,arg3); @@ -5387,12 +5925,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetFormatMode(arg2); @@ -5400,7 +5945,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5414,11 +5959,12 @@ 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(!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; @@ -5442,6 +5988,12 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject else arg2 = NULL; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFont(arg2,arg3); @@ -5462,12 +6014,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFont *)(arg1)->GetFont(arg2); @@ -5490,17 +6049,24 @@ 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(!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_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTextColour((wxString const &)*arg2,arg3); @@ -5529,12 +6095,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetTextColour(arg2); @@ -5573,7 +6146,7 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5588,17 +6161,24 @@ 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(!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_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRegionName((wxString const &)*arg2,arg3); @@ -5627,12 +6207,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionName",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetRegionName(arg2); @@ -5679,7 +6264,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_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -5922,12 +6507,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearText(arg2); @@ -5982,6 +6574,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,8 +6584,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPosition",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -6001,7 +6612,7 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6034,7 +6645,7 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6047,12 +6658,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AttachmentIsValid",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AttachmentIsValid(arg2); @@ -6060,7 +6676,7 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6105,6 +6721,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,8 +6731,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg7, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -6124,7 +6759,7 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6153,12 +6788,14 @@ 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(!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; @@ -6168,6 +6805,14 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6197,14 +6842,19 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_AttachmentSortTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; @@ -6220,7 +6870,7 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6235,20 +6885,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_EraseLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6274,20 +6931,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:PyShape_DrawLinks",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6316,17 +6980,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_MoveLineToNewAttachment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->MoveLineToNewAttachment(*arg2,arg3,arg4,arg5); @@ -6334,7 +7008,7 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6374,12 +7048,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBranchingAttachmentRoot(arg2); @@ -6412,6 +7091,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 +7100,12 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail; @@ -6445,7 +7129,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6463,14 +7147,24 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxRealPoint_helper(obj3, &arg4)) SWIG_fail; @@ -6486,7 +7180,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6499,12 +7193,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetAttachmentLineCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetAttachmentLineCount(arg2); @@ -6512,7 +7211,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6524,12 +7223,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchNeckLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchNeckLength(arg2); @@ -6562,7 +7266,7 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6574,14 +7278,19 @@ 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(!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; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchStemLength(arg2); wxPyEndAllowThreads(__tstate); @@ -6612,7 +7321,7 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6624,12 +7333,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchSpacing(arg2); @@ -6662,7 +7376,7 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6674,12 +7388,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBranchStyle(arg2); @@ -6712,7 +7431,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_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -6725,12 +7444,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->PhysicalToLogicalAttachment(arg2); @@ -6738,7 +7462,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6751,12 +7475,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->LogicalToPhysicalAttachment(arg2); @@ -6764,7 +7493,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6789,7 +7518,7 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6817,7 +7546,7 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6841,13 +7570,13 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6934,12 +7663,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -6972,7 +7716,7 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -6984,12 +7728,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetRotation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRotation(arg2); @@ -7250,7 +7999,7 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7396,12 +8145,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -7424,12 +8197,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -7452,12 +8249,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -7478,12 +8299,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -7510,20 +8341,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -7534,7 +8385,7 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7552,20 +8403,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -7593,16 +8464,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -7625,12 +8520,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -7653,12 +8572,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -7683,16 +8626,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -7715,12 +8682,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -7743,12 +8734,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -7773,16 +8788,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -7877,7 +8912,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7907,17 +8942,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -7942,13 +9001,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -7973,13 +9056,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -8000,12 +9107,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -8026,12 +9143,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -8109,16 +9236,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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Draw(*arg2,arg3,arg4); @@ -8193,12 +9330,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scale(arg2,arg3); @@ -8219,12 +9366,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_ScaleTo",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ScaleTo(arg2,arg3); @@ -8245,12 +9402,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Translate(arg2,arg3); @@ -8272,12 +9439,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -8324,7 +9506,7 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8415,7 +9597,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8450,7 +9632,7 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8463,12 +9645,22 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(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_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -8624,12 +9816,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOutlineOp(arg2); @@ -8662,7 +9859,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8687,7 +9884,7 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8771,16 +9968,21 @@ 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(!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_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -8849,16 +10051,26 @@ 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(!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_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4); @@ -8988,13 +10200,18 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args, int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PseudoMetaFile_DrawLines",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9017,14 +10234,26 @@ 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 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|i:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PseudoMetaFile_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4); @@ -9045,13 +10274,18 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args, int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9156,7 +10390,7 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -9206,7 +10440,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -9339,12 +10573,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBackgroundMode(arg2); @@ -9371,11 +10610,25 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyRectangleShape *result; + 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyRectangleShape *)new wxPyRectangleShape(arg1,arg2); @@ -9425,12 +10678,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCornerRadius(arg2); @@ -9463,7 +10721,7 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -9574,7 +10832,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -9720,12 +10978,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -9748,12 +11030,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -9776,38 +11082,72 @@ 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(!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; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ; 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -9834,20 +11174,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -9858,7 +11218,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9876,20 +11236,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -9917,16 +11297,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -9949,12 +11353,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -9977,12 +11405,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -10007,16 +11459,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -10039,12 +11515,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -10067,12 +11567,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -10097,16 +11621,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -10201,7 +11745,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10231,17 +11775,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -10266,13 +11834,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -10297,13 +11889,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -10324,12 +11940,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -10350,12 +11976,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyRectangleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -10388,17 +12024,45 @@ 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 (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyControlPoint *)new wxPyControlPoint(arg1,arg2,arg3,arg4,arg5,arg6); @@ -10448,12 +12112,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCornerRadius(arg2); @@ -10572,7 +12241,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10718,12 +12387,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -10746,12 +12439,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -10774,12 +12491,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -10800,12 +12541,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -10832,20 +12583,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -10856,7 +12627,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10874,20 +12645,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -10915,16 +12706,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -10947,12 +12762,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -10975,12 +12814,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -11005,16 +12868,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -11037,12 +12924,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -11065,12 +12976,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -11095,16 +13030,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -11199,7 +13154,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject * } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -11229,17 +13184,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -11264,13 +13243,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -11295,13 +13298,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -11322,12 +13349,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -11348,12 +13385,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -11660,7 +13707,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -11806,12 +13853,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -11834,12 +13905,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -11862,12 +13957,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -11888,12 +14007,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -11920,20 +14049,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -11944,7 +14093,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11962,20 +14111,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -12003,16 +14172,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -12035,12 +14228,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -12063,12 +14280,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -12093,16 +14334,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -12125,12 +14390,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -12153,12 +14442,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -12183,16 +14496,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -12287,7 +14620,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -12317,17 +14650,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -12352,13 +14709,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -12383,13 +14764,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -12410,12 +14815,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -12436,12 +14851,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyBitmapShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -12613,12 +15038,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawAtAngle(arg2); @@ -12642,16 +15072,26 @@ 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(!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_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxRect const &)*arg2,arg3,arg4); @@ -12710,13 +15150,18 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, Py int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyDrawnShape_DrawLines",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawLines",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12770,14 +15215,26 @@ 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 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|i:PyDrawnShape_DrawPolygon",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyDrawnShape_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4); @@ -12831,16 +15288,21 @@ 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(!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_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -12861,13 +15323,18 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, P int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "PCOUNT",(char *) "points", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyDrawnShape_DrawSpline",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_DrawSpline",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12948,7 +15415,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13001,7 +15468,7 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -13034,7 +15501,7 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -13056,12 +15523,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Rotate(arg2,arg3,arg4); @@ -13143,12 +15625,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDrawnBackgroundMode(arg2); @@ -13195,7 +15682,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -13295,7 +15782,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args, } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -13350,12 +15837,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scale(arg2,arg3); @@ -13383,7 +15880,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13406,12 +15903,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Translate(arg2,arg3); @@ -13530,7 +16037,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -13676,12 +16183,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -13704,12 +16235,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -13732,12 +16287,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -13758,12 +16337,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -13790,20 +16379,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -13814,7 +16423,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13832,20 +16441,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -13873,16 +16502,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -13905,12 +16558,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -13933,12 +16610,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -13963,16 +16664,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -13995,12 +16720,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -14023,12 +16772,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -14053,16 +16826,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -14157,7 +16950,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -14187,17 +16980,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -14222,13 +17039,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -14253,13 +17094,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -14280,12 +17145,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -14306,12 +17181,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDrawnShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -14339,13 +17224,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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg3 = obj2; { @@ -14382,7 +17272,7 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14395,12 +17285,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_SetSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2,arg3); @@ -14422,12 +17322,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_Equals",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxOGLConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Equals(arg2,arg3); @@ -14435,7 +17345,7 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14571,14 +17481,19 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg4 = obj3; { @@ -14605,14 +17520,19 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPyShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -14676,7 +17596,7 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14856,7 +17776,7 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14994,7 +17914,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -15140,12 +18060,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -15168,12 +18112,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -15196,12 +18164,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -15222,12 +18214,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -15254,20 +18256,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -15278,7 +18300,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15296,20 +18318,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -15337,16 +18379,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -15369,12 +18435,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -15397,12 +18487,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -15427,16 +18541,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -15459,12 +18597,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -15487,12 +18649,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -15517,16 +18703,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -15621,7 +18827,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -15651,17 +18857,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -15686,13 +18916,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -15717,13 +18971,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -15744,12 +19022,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -15770,12 +19058,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCompositeShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -15802,11 +19100,25 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyDividedShape *result; + 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyDividedShape *)new wxPyDividedShape(arg1,arg2); @@ -16003,7 +19315,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -16149,12 +19461,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -16177,12 +19513,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -16205,12 +19565,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -16231,12 +19615,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -16263,20 +19657,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -16287,7 +19701,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16305,20 +19719,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -16346,16 +19780,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -16378,12 +19836,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -16406,12 +19888,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -16436,16 +19942,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -16468,12 +19998,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -16496,12 +20050,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -16526,16 +20104,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -16630,7 +20228,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject * } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -16660,17 +20258,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -16695,13 +20317,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -16726,13 +20372,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -16753,12 +20423,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -16779,12 +20459,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDividedShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -16866,15 +20556,20 @@ 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(!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; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16897,15 +20592,20 @@ 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(!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; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16928,15 +20628,20 @@ 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(!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; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16959,15 +20664,20 @@ 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(!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; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -16989,12 +20699,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_Divide",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Divide(arg2); @@ -17014,12 +20729,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_EditEdge",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EditEdge(arg2); @@ -17079,7 +20799,7 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17255,15 +20975,25 @@ 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(!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; { - arg4 = (bool) SPyObj_AsBool(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -17286,12 +21016,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopupMenu(arg2,arg3); @@ -17338,12 +21078,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetHandleSide",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandleSide(arg2); @@ -17711,7 +21456,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -17857,12 +21602,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -17885,12 +21654,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -17913,12 +21706,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -17939,12 +21756,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -17971,20 +21798,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -17995,7 +21842,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18013,20 +21860,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -18054,16 +21921,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -18086,12 +21977,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -18114,12 +22029,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -18144,16 +22083,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -18176,12 +22139,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -18204,12 +22191,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -18234,16 +22245,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -18338,7 +22369,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -18368,17 +22399,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -18403,13 +22458,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -18434,13 +22513,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -18461,12 +22564,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -18487,12 +22600,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDivisionShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -18519,11 +22642,25 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyEllipseShape *result; + 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyEllipseShape *)new wxPyEllipseShape(arg1,arg2); @@ -18648,7 +22785,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -18794,12 +22931,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -18822,12 +22983,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -18850,12 +23035,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -18876,12 +23085,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -18908,20 +23127,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -18932,7 +23171,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18950,20 +23189,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -18991,16 +23250,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19023,12 +23306,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -19051,12 +23358,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -19081,16 +23412,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -19113,12 +23468,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -19141,12 +23520,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -19171,16 +23574,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -19275,7 +23698,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject * } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -19305,17 +23728,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -19340,13 +23787,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19371,13 +23842,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19398,12 +23893,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -19424,12 +23929,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyEllipseShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -19455,11 +23970,18 @@ 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyCircleShape *)new wxPyCircleShape(arg1); @@ -19584,7 +24106,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -19730,12 +24252,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -19758,12 +24304,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -19786,12 +24356,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -19812,12 +24406,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -19844,20 +24448,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -19868,7 +24492,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19886,20 +24510,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -19927,16 +24571,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -19959,12 +24627,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -19987,12 +24679,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -20017,16 +24733,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -20049,12 +24789,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -20077,12 +24841,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -20107,16 +24895,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -20211,7 +25019,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -20241,17 +25049,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -20276,13 +25108,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -20307,13 +25163,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -20334,12 +25214,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -20360,12 +25250,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyCircleShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -20399,13 +25299,42 @@ 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_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = wxString_in_helper(obj4); @@ -20416,6 +25345,12 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxArrowHead *)new wxArrowHead(arg1,arg2,arg3,arg4,(wxString const &)*arg5,arg6,arg7); @@ -20482,7 +25417,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20507,7 +25442,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20519,12 +25454,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -20557,7 +25497,7 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20582,7 +25522,7 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20607,7 +25547,7 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20632,7 +25572,7 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20675,12 +25615,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetXOffset",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetXOffset(arg2); @@ -20700,12 +25645,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetYOffset",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetYOffset(arg2); @@ -20765,7 +25715,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_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -20790,7 +25740,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20815,7 +25765,7 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -20827,12 +25777,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2); @@ -20852,12 +25807,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2); @@ -20944,14 +25904,41 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:PyLineShape_AddArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -20962,6 +25949,12 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPseudoMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj7) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddArrow(arg2,arg3,arg4,arg5,(wxString const &)*arg6,arg7,arg8); @@ -20993,14 +25986,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(!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_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyLineShape_AddArrowOrdered(arg1,arg2,arg3,arg4); @@ -21041,7 +26039,7 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -21061,12 +26059,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearArrowsAtPosition(arg2); @@ -21091,12 +26096,13 @@ 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(!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) { @@ -21104,7 +26110,11 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxArrowHead,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg5 = (bool) SPyObj_AsBool(obj4); + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -21127,12 +26137,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteArrowHead(arg2); @@ -21140,7 +26155,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21155,13 +26170,18 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -21174,7 +26194,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -21207,7 +26227,7 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21254,17 +26274,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_DrawRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRegion(*arg2,arg3,arg4,arg5); @@ -21289,17 +26319,27 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_EraseRegion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EraseRegion(*arg2,arg3,arg4,arg5); @@ -21320,12 +26360,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_FindArrowHeadId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxArrowHead *)(arg1)->FindArrowHead(arg2); @@ -21350,13 +26395,18 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -21445,12 +26495,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindLinePosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->FindLinePosition(arg2,arg3); @@ -21458,7 +26518,7 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21483,7 +26543,7 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -21512,7 +26572,7 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj 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); + arg5 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -21555,7 +26615,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21580,7 +26640,7 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21675,14 +26735,19 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetLabelPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetLabelPosition(arg2,arg3,arg4); @@ -21832,7 +26897,7 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21857,7 +26922,7 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21869,12 +26934,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeLineControlPoints(arg2); @@ -21919,12 +26989,17 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *a 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentFrom(arg2); @@ -21945,12 +27020,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAttachments",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachments(arg2,arg3); @@ -21970,12 +27055,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentTo",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttachmentTo(arg2); @@ -21998,12 +27088,32 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_SetEnds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEnds(arg2,arg3,arg4,arg5); @@ -22058,7 +27168,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22088,7 +27198,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22200,11 +27310,11 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -22228,14 +27338,19 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -22266,7 +27381,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22276,7 +27391,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22297,7 +27412,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22307,7 +27422,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22332,7 +27447,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22357,7 +27472,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22444,7 +27559,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22590,12 +27705,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -22618,12 +27757,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -22646,12 +27809,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -22672,12 +27859,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -22704,20 +27901,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -22728,7 +27945,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22746,20 +27963,40 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:PyLineShape_base_OnMovePost",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -22787,16 +28024,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -22819,12 +28080,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -22847,12 +28132,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -22877,16 +28186,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -22909,12 +28242,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -22937,12 +28294,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -22967,16 +28348,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -23071,7 +28472,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -23101,17 +28502,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -23136,13 +28561,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -23167,13 +28616,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -23194,12 +28667,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -23220,12 +28703,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyLineShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -23332,12 +28825,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddPolygonPoint(arg2); @@ -23381,12 +28881,19 @@ 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(!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_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeletePolygonPoint(arg2); @@ -23469,7 +28976,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -23494,7 +29001,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -23506,12 +29013,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOriginalWidth(arg2); @@ -23531,12 +29043,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOriginalHeight(arg2); @@ -23655,7 +29172,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -23801,12 +29318,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -23829,12 +29370,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -23857,12 +29422,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -23883,12 +29472,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -23915,20 +29514,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -23939,7 +29558,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23957,20 +29576,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -23998,16 +29637,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24030,12 +29693,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -24058,12 +29745,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -24088,16 +29799,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -24120,12 +29855,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -24148,12 +29907,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -24178,16 +29961,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -24282,7 +30085,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject * } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -24312,17 +30115,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); if (PyErr_Occurred()) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -24347,13 +30174,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24378,13 +30229,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24405,12 +30280,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -24431,12 +30316,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPolygonShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -24463,11 +30358,25 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPyTextShape *result; + 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_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyTextShape *)new wxPyTextShape(arg1,arg2); @@ -24616,7 +30525,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -24762,12 +30671,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4,arg5); @@ -24790,12 +30723,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftDoubleClick(arg2,arg3,arg4,arg5); @@ -24818,12 +30775,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4,arg5); @@ -24844,12 +30825,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSize(arg2,arg3); @@ -24876,20 +30867,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -24900,7 +30911,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24918,20 +30929,40 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -24959,16 +30990,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -24991,12 +31046,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4,arg5); @@ -25019,12 +31098,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4,arg5); @@ -25049,16 +31152,40 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5,arg6); @@ -25081,12 +31208,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4,arg5); @@ -25109,12 +31260,36 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4,arg5); @@ -25139,16 +31314,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -25243,7 +31438,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -25273,17 +31468,41 @@ 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(!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) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingDragLeft(arg2,arg3,arg4,arg5,arg6,arg7); @@ -25308,13 +31527,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingBeginDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -25339,13 +31582,37 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnSizingEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyControlPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnSizingEndDragLeft(arg2,arg3,arg4,arg5,arg6); @@ -25366,12 +31633,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginSize(arg2,arg3); @@ -25392,12 +31669,22 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextShape,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndSize(arg2,arg3); @@ -25539,16 +31826,36 @@ 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(!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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawOutline(*arg2,arg3,arg4,arg5,arg6); @@ -25569,12 +31876,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_FindShape",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindShape(arg2); @@ -25636,7 +31948,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_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -25661,7 +31973,7 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -25686,7 +31998,7 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -25736,7 +32048,7 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25761,7 +32073,7 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25938,12 +32250,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetGridSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetGridSpacing(arg2); @@ -25963,12 +32280,17 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetMouseTolerance",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDiagram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMouseTolerance(arg2); @@ -25996,7 +32318,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -26026,7 +32348,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -26056,7 +32378,7 @@ 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); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -26144,17 +32466,25 @@ 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 (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -26167,6 +32497,12 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -26271,6 +32607,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,8 +32616,16 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxClassInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -26316,13 +32662,28 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyShape *)(arg1)->FindFirstSensitiveShape(arg2,arg3,arg4,arg5); @@ -26388,7 +32749,7 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26429,12 +32790,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragLeft(arg2,arg3,arg4); @@ -26456,12 +32834,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnBeginDragRight(arg2,arg3,arg4); @@ -26483,12 +32878,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragLeft(arg2,arg3,arg4); @@ -26510,12 +32922,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnEndDragRight(arg2,arg3,arg4); @@ -26539,16 +32968,33 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragLeft(arg2,arg3,arg4,arg5); @@ -26572,16 +33018,33 @@ 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(!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) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); if (PyErr_Occurred()) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnDragRight(arg2,arg3,arg4,arg5); @@ -26603,12 +33066,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnLeftClick(arg2,arg3,arg4); @@ -26630,12 +33110,29 @@ 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyShapeCanvas,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnRightClick(arg2,arg3,arg4); @@ -28591,6 +35088,7 @@ static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC" static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPoint *", 0},{"_p_wxRealPoint"},{0}}; static swig_type_info _swigt__p_wxPyControlPoint[] = {{"_p_wxPyControlPoint", 0, "wxPyControlPoint *", 0},{"_p_wxPyControlPoint"},{0}}; static swig_type_info _swigt__p_wxArrowHead[] = {{"_p_wxArrowHead", 0, "wxArrowHead *", 0},{"_p_wxArrowHead"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxStringList[] = {{"_p_wxStringList", 0, "wxStringList *", 0},{"_p_wxStringList"},{0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0},{"_p_bool"},{0}}; @@ -28599,8 +35097,8 @@ static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}}; -static swig_type_info _swigt__p_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_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0},{"_p_wxPyDivisionShape"},{0}}; static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0},{"_p_wxPyPolygonShape"},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject},{0}}; @@ -28634,6 +35132,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, @@ -28642,8 +35141,8 @@ _swigt__p_wxFont, _swigt__p_wxScrolledWindow, _swigt__p_wxWindow, _swigt__p_double, -_swigt__p_wxPyDivisionShape, _swigt__p_wxPyDrawnShape, +_swigt__p_wxPyDivisionShape, _swigt__p_wxPyPolygonShape, _swigt__p_wxBitmap, _swigt__p_wxObject, @@ -28674,70 +35173,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 +35199,70 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_PyObj_FromInt((int)oglMETAFLAGS_OUTLINE)); + PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_PyObj_FromInt((int)oglMETAFLAGS_ATTACHMENTS)); + PyDict_SetItemString(d,"KEY_SHIFT", SWIG_PyObj_FromInt((int)KEY_SHIFT)); + PyDict_SetItemString(d,"KEY_CTRL", SWIG_PyObj_FromInt((int)KEY_CTRL)); + PyDict_SetItemString(d,"ARROW_NONE", SWIG_PyObj_FromInt((int)ARROW_NONE)); + PyDict_SetItemString(d,"ARROW_END", SWIG_PyObj_FromInt((int)ARROW_END)); + PyDict_SetItemString(d,"ARROW_BOTH", SWIG_PyObj_FromInt((int)ARROW_BOTH)); + PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_PyObj_FromInt((int)ARROW_MIDDLE)); + PyDict_SetItemString(d,"ARROW_START", SWIG_PyObj_FromInt((int)ARROW_START)); + PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_HOLLOW_CIRCLE)); + PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_PyObj_FromInt((int)ARROW_FILLED_CIRCLE)); + PyDict_SetItemString(d,"ARROW_ARROW", SWIG_PyObj_FromInt((int)ARROW_ARROW)); + PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_SINGLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_PyObj_FromInt((int)ARROW_DOUBLE_OBLIQUE)); + PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_PyObj_FromInt((int)ARROW_METAFILE)); + PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_PyObj_FromInt((int)ARROW_POSITION_END)); + PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_PyObj_FromInt((int)ARROW_POSITION_START)); + PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_VERTICAL)); + PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_HORIZONTAL)); + PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_PyObj_FromInt((int)CONTROL_POINT_DIAGONAL)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_TO)); + PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_PyObj_FromInt((int)CONTROL_POINT_ENDPOINT_FROM)); + PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_PyObj_FromInt((int)CONTROL_POINT_LINE)); + PyDict_SetItemString(d,"FORMAT_NONE", SWIG_PyObj_FromInt((int)FORMAT_NONE)); + PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_HORIZ)); + PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_PyObj_FromInt((int)FORMAT_CENTRE_VERT)); + PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_PyObj_FromInt((int)FORMAT_SIZE_TO_CONTENTS)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_HORIZ)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_VERT)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE)); + PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_PyObj_FromInt((int)LINE_ALIGNMENT_NONE)); + PyDict_SetItemString(d,"SHADOW_NONE", SWIG_PyObj_FromInt((int)SHADOW_NONE)); + PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_PyObj_FromInt((int)SHADOW_LEFT)); + PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_PyObj_FromInt((int)SHADOW_RIGHT)); + PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_PyObj_FromInt((int)OP_CLICK_LEFT)); + PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_PyObj_FromInt((int)OP_CLICK_RIGHT)); + PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_PyObj_FromInt((int)OP_DRAG_LEFT)); + PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_PyObj_FromInt((int)OP_DRAG_RIGHT)); + PyDict_SetItemString(d,"OP_ALL", SWIG_PyObj_FromInt((int)OP_ALL)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_NONE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_EDGE)); + PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_PyObj_FromInt((int)ATTACHMENT_MODE_BRANCHING)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_NORMAL)); + PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_PyObj_FromInt((int)BRANCHING_ATTACHMENT_BLOB)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY)); + PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_PyObj_FromInt((int)gyCONSTRAINT_CENTRED_BOTH)); + PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_LEFT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_PyObj_FromInt((int)gyCONSTRAINT_RIGHT_OF)); + PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ABOVE)); + PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_PyObj_FromInt((int)gyCONSTRAINT_BELOW)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT)); + PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_PyObj_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_PyObj_FromInt((int)DIVISION_SIDE_NONE)); + PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_LEFT)); + PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_PyObj_FromInt((int)DIVISION_SIDE_TOP)); + PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_PyObj_FromInt((int)DIVISION_SIDE_RIGHT)); + PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_PyObj_FromInt((int)DIVISION_SIDE_BOTTOM)); // initoglbasicc(); diff --git a/wxPython/contrib/stc/stc_wrap.cpp b/wxPython/contrib/stc/stc_wrap.cpp index 3df780fcdc..fc6e6f5028 100644 --- a/wxPython/contrib/stc/stc_wrap.cpp +++ b/wxPython/contrib/stc/stc_wrap.cpp @@ -368,7 +368,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { #ifdef __cplusplus extern "C" { #endif -static int _wrap_STCNameStr_set(PyObject *_val) { +static int _wrap_STCNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable STCNameStr is read-only."); return 1; } diff --git a/wxPython/contrib/xrc/xrc_wrap.cpp b/wxPython/contrib/xrc/xrc_wrap.cpp index 40abee10ff..516e8bfafb 100644 --- a/wxPython/contrib/xrc/xrc_wrap.cpp +++ b/wxPython/contrib/xrc/xrc_wrap.cpp @@ -504,7 +504,7 @@ SWIG_PyObj_AsLong(PyObject * obj) #ifdef __cplusplus extern "C" { #endif -static int _wrap_UTF8String_set(PyObject *_val) { +static int _wrap_UTF8String_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable UTF8String is read-only."); return 1; } @@ -524,7 +524,7 @@ static PyObject *_wrap_UTF8String_get() { } -static int _wrap_StyleString_set(PyObject *_val) { +static int _wrap_StyleString_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StyleString is read-only."); return 1; } @@ -544,7 +544,7 @@ static PyObject *_wrap_StyleString_get() { } -static int _wrap_SizeString_set(PyObject *_val) { +static int _wrap_SizeString_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SizeString is read-only."); return 1; } @@ -564,7 +564,7 @@ static PyObject *_wrap_SizeString_get() { } -static int _wrap_PosString_set(PyObject *_val) { +static int _wrap_PosString_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable PosString is read-only."); return 1; } @@ -584,7 +584,7 @@ static PyObject *_wrap_PosString_get() { } -static int _wrap_BitmapString_set(PyObject *_val) { +static int _wrap_BitmapString_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable BitmapString is read-only."); return 1; } @@ -604,7 +604,7 @@ static PyObject *_wrap_BitmapString_get() { } -static int _wrap_IconString_set(PyObject *_val) { +static int _wrap_IconString_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IconString is read-only."); return 1; } @@ -624,7 +624,7 @@ static PyObject *_wrap_IconString_get() { } -static int _wrap_FontString_set(PyObject *_val) { +static int _wrap_FontString_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FontString is read-only."); return 1; } diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index b717b5f12d..6e446b2c1e 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -463,6 +463,22 @@ class wxPythonDemo(wx.Frame): splitter = wx.SplitterWindow(self, -1) splitter2 = wx.SplitterWindow(splitter, -1) + # Set up a log on the View Log Notebook page + self.log = wx.TextCtrl(splitter2, -1, + style = wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL) + + # Set the wxWindows log target to be this textctrl + #wx.Log_SetActiveTarget(wx.LogTextCtrl(self.log)) + + # But instead of the above we want to show how to use our own wx.Log class + wx.Log_SetActiveTarget(MyLog(self.log)) + + # for serious debugging + #wx.Log_SetActiveTarget(wx.LogStderr()) + #wx.Log_SetTraceMask(wx.TraceMessages) + + + def EmptyHandler(evt): pass #splitter.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler) #splitter2.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler) @@ -578,21 +594,6 @@ class wxPythonDemo(wx.Frame): self.LoadDemoSource('Main.py') - # Set up a log on the View Log Notebook page - self.log = wx.TextCtrl(splitter2, -1, - style = wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL) - - # Set the wxWindows log target to be this textctrl - #wx.Log_SetActiveTarget(wx.LogTextCtrl(self.log)) - - # But instead of the above we want to show how to use our own wx.Log class - wx.Log_SetActiveTarget(MyLog(self.log)) - - # for serious debugging - #wx.Log_SetActiveTarget(wx.LogStderr()) - #wx.Log_SetTraceMask(wx.TraceMessages) - - # add the windows to the splitter and split it. splitter2.SplitHorizontally(self.nb, self.log, -120) splitter.SplitVertically(self.tree, splitter2, 180) diff --git a/wxPython/src/mac/calendar_wrap.cpp b/wxPython/src/mac/calendar_wrap.cpp index 61ae12a89f..7d37ee0fc9 100644 --- a/wxPython/src/mac/calendar_wrap.cpp +++ b/wxPython/src/mac/calendar_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -388,14 +237,15 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxCalendarDateAttr swig_types[4] #define SWIGTYPE_p_wxWindow swig_types[5] #define SWIGTYPE_p_wxCommandEvent swig_types[6] -#define SWIGTYPE_p_wxString swig_types[7] -#define SWIGTYPE_p_wxEvtHandler swig_types[8] -#define SWIGTYPE_p_wxFont swig_types[9] -#define SWIGTYPE_p_wxDateTime swig_types[10] -#define SWIGTYPE_p_wxControl swig_types[11] -#define SWIGTYPE_p_wxCalendarCtrl swig_types[12] -#define SWIGTYPE_p_wxEvent swig_types[13] -static swig_type_info *swig_types[15]; +#define SWIGTYPE_p_char swig_types[7] +#define SWIGTYPE_p_wxString swig_types[8] +#define SWIGTYPE_p_wxEvtHandler swig_types[9] +#define SWIGTYPE_p_wxFont swig_types[10] +#define SWIGTYPE_p_wxDateTime swig_types[11] +#define SWIGTYPE_p_wxControl swig_types[12] +#define SWIGTYPE_p_wxCalendarCtrl swig_types[13] +#define SWIGTYPE_p_wxEvent swig_types[14] +static swig_type_info *swig_types[16]; /* -------- TYPES TABLE (END) -------- */ @@ -407,12 +257,81 @@ static swig_type_info *swig_types[15]; #define SWIG_name "_calendar" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + static const wxString wxPyCalendarNameStr(wxCalendarNameStr); + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + #ifdef __cplusplus extern "C" { #endif @@ -434,11 +353,12 @@ static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyOb PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "colText",(char *) "colBack",(char *) "colBorder",(char *) "font",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOi:new_CalendarDateAttr",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_CalendarDateAttr",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; @@ -461,6 +381,12 @@ static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyOb PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } + if (obj4) { + { + arg5 = (wxCalendarDateBorder) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCalendarDateAttr *)new wxCalendarDateAttr((wxColour const &)*arg1,(wxColour const &)*arg2,(wxColour const &)*arg3,(wxFont const &)*arg4,(wxCalendarDateBorder )arg5); @@ -482,12 +408,17 @@ static PyObject *_wrap_new_CalendarDateAttrBorder(PyObject *self, PyObject *args wxColour *arg2 = (wxColour *) &arg2_defvalue ; wxCalendarDateAttr *result; wxColour temp2 ; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "border",(char *) "colBorder", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|O:new_CalendarDateAttrBorder",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_CalendarDateAttrBorder",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxCalendarDateBorder) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { { arg2 = &temp2; @@ -636,12 +567,17 @@ static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *self, PyObject *args wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CalendarDateAttr_SetBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarDateAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxCalendarDateBorder) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorder((wxCalendarDateBorder )arg2); @@ -669,7 +605,7 @@ static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetHoliday",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarDateAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -704,7 +640,7 @@ static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -729,7 +665,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -754,7 +690,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -779,7 +715,7 @@ static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -804,7 +740,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -829,7 +765,7 @@ static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -970,7 +906,7 @@ static PyObject *_wrap_CalendarDateAttr_GetBorder(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -990,12 +926,17 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec wxEventType arg2 ; wxCalendarEvent *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "cal",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:new_CalendarEvent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_CalendarEvent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCalendarEvent *)new wxCalendarEvent(arg1,arg2); @@ -1074,12 +1015,17 @@ static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *self, PyObject *args, wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "wd", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CalendarEvent_SetWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarEvent_SetWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWeekDay((wxDateTime::WeekDay )arg2); @@ -1112,7 +1058,7 @@ static PyObject *_wrap_CalendarEvent_GetWeekDay(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1126,7 +1072,7 @@ static PyObject * CalendarEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_CalendarNameStr_set(PyObject *_val) { +static int _wrap_CalendarNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable CalendarNameStr is read-only."); return 1; } @@ -1164,16 +1110,22 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "date",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlO:new_CalendarCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:new_CalendarCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { @@ -1192,6 +1144,12 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1263,17 +1221,23 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj bool temp8 = 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 *) "parent",(char *) "id",(char *) "date",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlO:CalendarCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:CalendarCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { @@ -1292,6 +1256,12 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -1306,7 +1276,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -1406,7 +1376,7 @@ static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1468,7 +1438,7 @@ static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1539,7 +1509,7 @@ static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1560,7 +1530,7 @@ static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -1592,7 +1562,7 @@ static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -1624,7 +1594,7 @@ static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -1944,7 +1914,7 @@ static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_GetAttr",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -1976,7 +1946,7 @@ static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:CalendarCtrl_SetAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxCalendarDateAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -2007,7 +1977,7 @@ static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_SetHoliday",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2037,7 +2007,7 @@ static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_ResetAttr",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2089,7 +2059,7 @@ static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2111,7 +2081,7 @@ static PyObject *_wrap_CalendarCtrl_Enable(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -2122,7 +2092,7 @@ static PyObject *_wrap_CalendarCtrl_Enable(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2144,7 +2114,7 @@ static PyObject *_wrap_CalendarCtrl_Show(PyObject *self, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -2155,7 +2125,7 @@ static PyObject *_wrap_CalendarCtrl_Show(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2745,6 +2715,7 @@ static swig_type_info _swigt__p_wxCalendarEvent[] = {{"_p_wxCalendarEvent", 0, " static swig_type_info _swigt__p_wxCalendarDateAttr[] = {{"_p_wxCalendarDateAttr", 0, "wxCalendarDateAttr *", 0},{"_p_wxCalendarDateAttr"},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxCalendarCtrl", _p_wxCalendarCtrlTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxCalendarEvent", _p_wxCalendarEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxCalendarCtrl", _p_wxCalendarCtrlTo_p_wxEvtHandler},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; @@ -2761,6 +2732,7 @@ _swigt__p_wxCalendarEvent, _swigt__p_wxCalendarDateAttr, _swigt__p_wxWindow, _swigt__p_wxCommandEvent, +_swigt__p_char, _swigt__p_wxString, _swigt__p_wxEvtHandler, _swigt__p_wxFont, @@ -2775,28 +2747,6 @@ _swigt__p_wxEvent, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"CAL_SUNDAY_FIRST", (long) wxCAL_SUNDAY_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_MONDAY_FIRST", (long) wxCAL_MONDAY_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_SHOW_HOLIDAYS", (long) wxCAL_SHOW_HOLIDAYS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_NO_YEAR_CHANGE", (long) wxCAL_NO_YEAR_CHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_NO_MONTH_CHANGE", (long) wxCAL_NO_MONTH_CHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_SEQUENTIAL_MONTH_SELECTION", (long) wxCAL_SEQUENTIAL_MONTH_SELECTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_SHOW_SURROUNDING_WEEKS", (long) wxCAL_SHOW_SURROUNDING_WEEKS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_NOWHERE", (long) wxCAL_HITTEST_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_HEADER", (long) wxCAL_HITTEST_HEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_DAY", (long) wxCAL_HITTEST_DAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_INCMONTH", (long) wxCAL_HITTEST_INCMONTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_DECMONTH", (long) wxCAL_HITTEST_DECMONTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_SURROUNDING_WEEK", (long) wxCAL_HITTEST_SURROUNDING_WEEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_BORDER_NONE", (long) wxCAL_BORDER_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_BORDER_SQUARE", (long) wxCAL_BORDER_SQUARE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_BORDER_ROUND", (long) wxCAL_BORDER_ROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_DOUBLECLICKED", (long) wxEVT_CALENDAR_DOUBLECLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_SEL_CHANGED", (long) wxEVT_CALENDAR_SEL_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_DAY_CHANGED", (long) wxEVT_CALENDAR_DAY_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_MONTH_CHANGED", (long) wxEVT_CALENDAR_MONTH_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_YEAR_CHANGED", (long) wxEVT_CALENDAR_YEAR_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_WEEKDAY_CLICKED", (long) wxEVT_CALENDAR_WEEKDAY_CLICKED, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -2823,6 +2773,22 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"CAL_SUNDAY_FIRST", SWIG_PyObj_FromInt((int)wxCAL_SUNDAY_FIRST)); + PyDict_SetItemString(d,"CAL_MONDAY_FIRST", SWIG_PyObj_FromInt((int)wxCAL_MONDAY_FIRST)); + PyDict_SetItemString(d,"CAL_SHOW_HOLIDAYS", SWIG_PyObj_FromInt((int)wxCAL_SHOW_HOLIDAYS)); + PyDict_SetItemString(d,"CAL_NO_YEAR_CHANGE", SWIG_PyObj_FromInt((int)wxCAL_NO_YEAR_CHANGE)); + PyDict_SetItemString(d,"CAL_NO_MONTH_CHANGE", SWIG_PyObj_FromInt((int)wxCAL_NO_MONTH_CHANGE)); + PyDict_SetItemString(d,"CAL_SEQUENTIAL_MONTH_SELECTION", SWIG_PyObj_FromInt((int)wxCAL_SEQUENTIAL_MONTH_SELECTION)); + PyDict_SetItemString(d,"CAL_SHOW_SURROUNDING_WEEKS", SWIG_PyObj_FromInt((int)wxCAL_SHOW_SURROUNDING_WEEKS)); + PyDict_SetItemString(d,"CAL_HITTEST_NOWHERE", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"CAL_HITTEST_HEADER", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_HEADER)); + PyDict_SetItemString(d,"CAL_HITTEST_DAY", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_DAY)); + PyDict_SetItemString(d,"CAL_HITTEST_INCMONTH", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_INCMONTH)); + PyDict_SetItemString(d,"CAL_HITTEST_DECMONTH", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_DECMONTH)); + PyDict_SetItemString(d,"CAL_HITTEST_SURROUNDING_WEEK", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_SURROUNDING_WEEK)); + PyDict_SetItemString(d,"CAL_BORDER_NONE", SWIG_PyObj_FromInt((int)wxCAL_BORDER_NONE)); + PyDict_SetItemString(d,"CAL_BORDER_SQUARE", SWIG_PyObj_FromInt((int)wxCAL_BORDER_SQUARE)); + PyDict_SetItemString(d,"CAL_BORDER_ROUND", SWIG_PyObj_FromInt((int)wxCAL_BORDER_ROUND)); PyDict_SetItemString(d, "wxEVT_CALENDAR_DOUBLECLICKED", PyInt_FromLong(wxEVT_CALENDAR_DOUBLECLICKED)); PyDict_SetItemString(d, "wxEVT_CALENDAR_SEL_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_SEL_CHANGED)); PyDict_SetItemString(d, "wxEVT_CALENDAR_DAY_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_DAY_CHANGED)); diff --git a/wxPython/src/mac/controls.py b/wxPython/src/mac/controls.py index 79b2fa0deb..43ae90077a 100644 --- a/wxPython/src/mac/controls.py +++ b/wxPython/src/mac/controls.py @@ -917,6 +917,12 @@ class TextAttr(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls.delete_TextAttr): + """__del__()""" + try: + if self.thisown: destroy(self) + except: pass + def Init(*args, **kwargs): """Init()""" return _controls.TextAttr_Init(*args, **kwargs) @@ -1570,12 +1576,13 @@ class RadioBox(core.Control): return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, String label, Point point=DefaultPosition, + __init__(Window parent, int id, String label, Point pos=DefaultPosition, Size size=DefaultSize, int choices=0, String choices_array=None, int majorDimension=0, long style=RA_HORIZONTAL, Validator validator=DefaultValidator, String name=RadioBoxNameStr) -> RadioBox """ + if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'] newobj = _controls.new_RadioBox(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -1584,7 +1591,7 @@ class RadioBox(core.Control): def Create(*args, **kwargs): """ - Create(Window parent, int id, String label, Point point=DefaultPosition, + Create(Window parent, int id, String label, Point pos=DefaultPosition, Size size=DefaultSize, int choices=0, String choices_array=None, int majorDimension=0, long style=RA_HORIZONTAL, Validator validator=DefaultValidator, @@ -1717,10 +1724,11 @@ class Slider(core.Control): def __init__(self, *args, **kwargs): """ __init__(Window parent, int id, int value, int minValue, int maxValue, - Point point=DefaultPosition, Size size=DefaultSize, + Point pos=DefaultPosition, Size size=DefaultSize, long style=SL_HORIZONTAL, Validator validator=DefaultValidator, String name=SliderNameStr) -> Slider """ + if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'] newobj = _controls.new_Slider(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -1730,7 +1738,7 @@ class Slider(core.Control): def Create(*args, **kwargs): """ Create(Window parent, int id, int value, int minValue, int maxValue, - Point point=DefaultPosition, Size size=DefaultSize, + Point pos=DefaultPosition, Size size=DefaultSize, long style=SL_HORIZONTAL, Validator validator=DefaultValidator, String name=SliderNameStr) -> bool """ @@ -1789,7 +1797,7 @@ class Slider(core.Control): return _controls.Slider_GetThumbLength(*args, **kwargs) def SetTickFreq(*args, **kwargs): - """SetTickFreq(int n, int pos)""" + """SetTickFreq(int n, int pos=1)""" return _controls.Slider_SetTickFreq(*args, **kwargs) def GetTickFreq(*args, **kwargs): diff --git a/wxPython/src/mac/controls_wrap.cpp b/wxPython/src/mac/controls_wrap.cpp index cf25d5f79f..880cca9407 100644 --- a/wxPython/src/mac/controls_wrap.cpp +++ b/wxPython/src/mac/controls_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -433,38 +282,39 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxContextHelpButton swig_types[49] #define SWIGTYPE_p_wxRadioBox swig_types[50] #define SWIGTYPE_p_wxScrollBar swig_types[51] -#define SWIGTYPE_p_wxTreeItemId swig_types[52] -#define SWIGTYPE_p_wxComboBox swig_types[53] -#define SWIGTYPE_p_wxHelpEvent swig_types[54] -#define SWIGTYPE_p_wxListItem swig_types[55] -#define SWIGTYPE_p_wxNotebookSizer swig_types[56] -#define SWIGTYPE_p_wxSpinEvent swig_types[57] -#define SWIGTYPE_p_wxGenericDragImage swig_types[58] -#define SWIGTYPE_p_wxSpinCtrl swig_types[59] -#define SWIGTYPE_p_wxImageList swig_types[60] -#define SWIGTYPE_p_wxHelpProvider swig_types[61] -#define SWIGTYPE_p_wxTextAttr swig_types[62] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[63] -#define SWIGTYPE_p_wxPoint swig_types[64] -#define SWIGTYPE_p_wxListbookEvent swig_types[65] -#define SWIGTYPE_p_wxNotebookEvent swig_types[66] -#define SWIGTYPE_p_wxObject swig_types[67] -#define SWIGTYPE_p_wxCursor swig_types[68] -#define SWIGTYPE_p_wxKeyEvent swig_types[69] -#define SWIGTYPE_p_wxWindow swig_types[70] -#define SWIGTYPE_p_wxString swig_types[71] -#define SWIGTYPE_p_wxBitmap swig_types[72] -#define SWIGTYPE_p_wxTreeEvent swig_types[73] -#define SWIGTYPE_p_wxMouseEvent swig_types[74] -#define SWIGTYPE_p_wxCommandEvent swig_types[75] -#define SWIGTYPE_p_wxStaticText swig_types[76] -#define SWIGTYPE_p_wxControlWithItems swig_types[77] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[78] -#define SWIGTYPE_p_wxColour swig_types[79] -#define SWIGTYPE_p_wxToolBar swig_types[80] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[81] -#define SWIGTYPE_p_wxValidator swig_types[82] -static swig_type_info *swig_types[84]; +#define SWIGTYPE_p_char swig_types[52] +#define SWIGTYPE_p_wxTreeItemId swig_types[53] +#define SWIGTYPE_p_wxComboBox swig_types[54] +#define SWIGTYPE_p_wxHelpEvent swig_types[55] +#define SWIGTYPE_p_wxListItem swig_types[56] +#define SWIGTYPE_p_wxNotebookSizer swig_types[57] +#define SWIGTYPE_p_wxSpinEvent swig_types[58] +#define SWIGTYPE_p_wxGenericDragImage swig_types[59] +#define SWIGTYPE_p_wxSpinCtrl swig_types[60] +#define SWIGTYPE_p_wxImageList swig_types[61] +#define SWIGTYPE_p_wxHelpProvider swig_types[62] +#define SWIGTYPE_p_wxTextAttr swig_types[63] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[64] +#define SWIGTYPE_p_wxPoint swig_types[65] +#define SWIGTYPE_p_wxListbookEvent swig_types[66] +#define SWIGTYPE_p_wxNotebookEvent swig_types[67] +#define SWIGTYPE_p_wxObject swig_types[68] +#define SWIGTYPE_p_wxCursor swig_types[69] +#define SWIGTYPE_p_wxKeyEvent swig_types[70] +#define SWIGTYPE_p_wxWindow swig_types[71] +#define SWIGTYPE_p_wxString swig_types[72] +#define SWIGTYPE_p_wxBitmap swig_types[73] +#define SWIGTYPE_p_wxTreeEvent swig_types[74] +#define SWIGTYPE_p_wxMouseEvent swig_types[75] +#define SWIGTYPE_p_wxCommandEvent swig_types[76] +#define SWIGTYPE_p_wxStaticText swig_types[77] +#define SWIGTYPE_p_wxControlWithItems swig_types[78] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[79] +#define SWIGTYPE_p_wxColour swig_types[80] +#define SWIGTYPE_p_wxToolBar swig_types[81] +#define SWIGTYPE_p_wxBookCtrlSizer swig_types[82] +#define SWIGTYPE_p_wxValidator swig_types[83] +static swig_type_info *swig_types[85]; /* -------- TYPES TABLE (END) -------- */ @@ -476,6 +326,44 @@ static swig_type_info *swig_types[84]; #define SWIG_name "_controls" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" @@ -483,7 +371,38 @@ static swig_type_info *swig_types[84]; static const wxString wxPyEmptyString(wxEmptyString); static const wxString wxPyControlNameStr(wxControlNameStr); static const wxString wxPyButtonNameStr(wxButtonNameStr); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + static const wxString wxPyCheckBoxNameStr(wxCheckBoxNameStr); + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + static const wxString wxPyChoiceNameStr(wxChoiceNameStr); static const wxString wxPyComboBoxNameStr(wxComboBoxNameStr); static const wxString wxPyGaugeNameStr(wxGaugeNameStr); @@ -576,6 +495,14 @@ public: #endif static const wxString wxPyNOTEBOOK_NAME(wxNOTEBOOK_NAME); + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + static const wxString wxPyToolBarNameStr(wxToolBarNameStr); PyObject *wxToolBarToolBase_GetClientData(wxToolBarToolBase *self){ wxPyUserData* udata = (wxPyUserData*)self->GetClientData(); @@ -781,6 +708,17 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl); + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + wxPyTreeItemData *wxPyTreeCtrl_GetItemData(wxPyTreeCtrl *self,wxTreeItemId const &item){ wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item); if (data == NULL) { @@ -936,7 +874,7 @@ void wxHelpProvider_Destroy(wxHelpProvider *self){ delete self; } #ifdef __cplusplus extern "C" { #endif -static int _wrap_ButtonNameStr_set(PyObject *_val) { +static int _wrap_ButtonNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ButtonNameStr is read-only."); return 1; } @@ -976,17 +914,23 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_Button",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_Button",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -1004,6 +948,12 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -1095,18 +1045,24 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:Button_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:Button_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -1124,6 +1080,12 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -1144,7 +1106,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -1243,17 +1205,23 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "bitmap",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_BitmapButton",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_BitmapButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -1270,6 +1238,12 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -1352,18 +1326,24 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "bitmap",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:BitmapButton_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:BitmapButton_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmapButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -1380,6 +1360,12 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -1400,7 +1386,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp9) delete arg9; @@ -1657,12 +1643,22 @@ static PyObject *_wrap_BitmapButton_SetMargins(PyObject *self, PyObject *args, P int arg2 ; int 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 *)"Oii:BitmapButton_SetMargins",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BitmapButton_SetMargins",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmapButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -1695,7 +1691,7 @@ static PyObject *_wrap_BitmapButton_GetMarginX(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1720,7 +1716,7 @@ static PyObject *_wrap_BitmapButton_GetMarginY(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1734,7 +1730,7 @@ static PyObject * BitmapButton_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_CheckBoxNameStr_set(PyObject *_val) { +static int _wrap_CheckBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable CheckBoxNameStr is read-only."); return 1; } @@ -1774,17 +1770,23 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_CheckBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_CheckBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -1802,6 +1804,12 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -1889,18 +1897,24 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:CheckBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:CheckBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -1918,6 +1932,12 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -1938,7 +1958,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -1979,7 +1999,7 @@ static PyObject *_wrap_CheckBox_GetValue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2004,7 +2024,7 @@ static PyObject *_wrap_CheckBox_IsChecked(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2024,7 +2044,7 @@ static PyObject *_wrap_CheckBox_SetValue(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckBox_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool const) SPyObj_AsBool(obj1); + arg2 = (bool const) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2059,7 +2079,7 @@ static PyObject *_wrap_CheckBox_Get3StateValue(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2071,12 +2091,17 @@ static PyObject *_wrap_CheckBox_Set3StateValue(PyObject *self, PyObject *args, P wxCheckBox *arg1 = (wxCheckBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CheckBox_Set3StateValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckBox_Set3StateValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxCheckBoxState) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set3StateValue((wxCheckBoxState )arg2); @@ -2109,7 +2134,7 @@ static PyObject *_wrap_CheckBox_Is3State(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2134,7 +2159,7 @@ static PyObject *_wrap_CheckBox_Is3rdStateAllowedForUser(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2148,7 +2173,7 @@ static PyObject * CheckBox_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ChoiceNameStr_set(PyObject *_val) { +static int _wrap_ChoiceNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ChoiceNameStr is read-only."); return 1; } @@ -2188,17 +2213,23 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar wxSize temp4 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlOO:new_Choice",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg7,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:new_Choice",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -2218,6 +2249,12 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar if (arg6 == NULL) SWIG_fail; } } + if (obj5) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -2303,18 +2340,24 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlOO:Choice_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg8,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:Choice_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -2334,6 +2377,12 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -2354,7 +2403,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (arg7) delete [] arg7; } @@ -2393,7 +2442,7 @@ static PyObject *_wrap_Choice_GetColumns(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2405,12 +2454,19 @@ static PyObject *_wrap_Choice_SetColumns(PyObject *self, PyObject *args, PyObjec wxChoice *arg1 = (wxChoice *) 0 ; int arg2 = (int) (int)1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Choice_SetColumns",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Choice_SetColumns",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumns(arg2); @@ -2430,12 +2486,17 @@ static PyObject *_wrap_Choice_SetSelection(PyObject *self, PyObject *args, PyObj wxChoice *arg1 = (wxChoice *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Choice_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Choice_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -2497,13 +2558,18 @@ static PyObject *_wrap_Choice_SetString(PyObject *self, PyObject *args, PyObject wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Choice_SetString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Choice_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -2538,7 +2604,7 @@ static PyObject * Choice_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ComboBoxNameStr_set(PyObject *_val) { +static int _wrap_ComboBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ComboBoxNameStr is read-only."); return 1; } @@ -2581,18 +2647,24 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOOlOO:new_ComboBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&arg8,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOOO:new_ComboBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -2619,6 +2691,12 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -2715,19 +2793,25 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject bool temp10 = 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 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOOlOO:ComboBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&arg9,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOO:ComboBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -2754,6 +2838,12 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject if (arg8 == NULL) SWIG_fail; } } + if (obj7) { + { + arg9 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj8) { if ((SWIG_ConvertPtr(obj8,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg10 == NULL) { @@ -2774,7 +2864,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -2951,12 +3041,17 @@ static PyObject *_wrap_ComboBox_SetInsertionPoint(PyObject *self, PyObject *args wxComboBox *arg1 = (wxComboBox *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ComboBox_SetInsertionPoint",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetInsertionPoint",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInsertionPoint(arg2); @@ -2989,7 +3084,7 @@ static PyObject *_wrap_ComboBox_GetInsertionPoint(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -3014,7 +3109,7 @@ static PyObject *_wrap_ComboBox_GetLastPosition(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -3029,13 +3124,23 @@ static PyObject *_wrap_ComboBox_Replace(PyObject *self, PyObject *args, PyObject wxString *arg4 = 0 ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OllO:ComboBox_Replace",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ComboBox_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -3068,12 +3173,17 @@ static PyObject *_wrap_ComboBox_SetSelection(PyObject *self, PyObject *args, PyO wxComboBox *arg1 = (wxComboBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ComboBox_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -3094,12 +3204,22 @@ static PyObject *_wrap_ComboBox_SetMark(PyObject *self, PyObject *args, PyObject long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ComboBox_SetMark",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_SetMark",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -3127,7 +3247,7 @@ static PyObject *_wrap_ComboBox_SetEditable(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetEditable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3174,12 +3294,22 @@ static PyObject *_wrap_ComboBox_Remove(PyObject *self, PyObject *args, PyObject long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ComboBox_Remove",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_Remove",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Remove(arg2,arg3); @@ -3201,7 +3331,7 @@ static PyObject * ComboBox_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_GaugeNameStr_set(PyObject *_val) { +static int _wrap_GaugeNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GaugeNameStr is read-only."); return 1; } @@ -3240,16 +3370,27 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "range",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|OOlOO:new_Gauge",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_Gauge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -3262,6 +3403,12 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -3340,17 +3487,28 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "range",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii|OOlOO:Gauge_Create",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:Gauge_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { arg5 = &temp5; @@ -3363,6 +3521,12 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -3383,7 +3547,7 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp9) delete arg9; @@ -3403,12 +3567,17 @@ static PyObject *_wrap_Gauge_SetRange(PyObject *self, PyObject *args, PyObject * wxGauge *arg1 = (wxGauge *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "range", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Gauge_SetRange",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetRange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2); @@ -3441,7 +3610,7 @@ static PyObject *_wrap_Gauge_GetRange(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3453,12 +3622,17 @@ static PyObject *_wrap_Gauge_SetValue(PyObject *self, PyObject *args, PyObject * wxGauge *arg1 = (wxGauge *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Gauge_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -3491,7 +3665,7 @@ static PyObject *_wrap_Gauge_GetValue(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3516,7 +3690,7 @@ static PyObject *_wrap_Gauge_IsVertical(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3528,12 +3702,17 @@ static PyObject *_wrap_Gauge_SetShadowWidth(PyObject *self, PyObject *args, PyOb wxGauge *arg1 = (wxGauge *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Gauge_SetShadowWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetShadowWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetShadowWidth(arg2); @@ -3566,7 +3745,7 @@ static PyObject *_wrap_Gauge_GetShadowWidth(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3578,12 +3757,17 @@ static PyObject *_wrap_Gauge_SetBezelFace(PyObject *self, PyObject *args, PyObje wxGauge *arg1 = (wxGauge *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Gauge_SetBezelFace",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetBezelFace",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBezelFace(arg2); @@ -3616,7 +3800,7 @@ static PyObject *_wrap_Gauge_GetBezelFace(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3630,7 +3814,7 @@ static PyObject * Gauge_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_StaticBitmapNameStr_set(PyObject *_val) { +static int _wrap_StaticBitmapNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StaticBitmapNameStr is read-only."); return 1; } @@ -3650,7 +3834,7 @@ static PyObject *_wrap_StaticBitmapNameStr_get() { } -static int _wrap_StaticBoxNameStr_set(PyObject *_val) { +static int _wrap_StaticBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StaticBoxNameStr is read-only."); return 1; } @@ -3670,7 +3854,7 @@ static PyObject *_wrap_StaticBoxNameStr_get() { } -static int _wrap_StaticTextNameStr_set(PyObject *_val) { +static int _wrap_StaticTextNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StaticTextNameStr is read-only."); return 1; } @@ -3708,16 +3892,22 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_StaticBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_StaticBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -3735,6 +3925,12 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -3818,17 +4014,23 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:StaticBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:StaticBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -3846,6 +4048,12 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -3860,7 +4068,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -3906,15 +4114,21 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject * 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 *)"Oi|OOlO:new_StaticLine",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_StaticLine",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -3927,6 +4141,12 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -3996,16 +4216,22 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:StaticLine_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:StaticLine_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticLine,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -4018,6 +4244,12 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -4032,7 +4264,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -4065,7 +4297,7 @@ static PyObject *_wrap_StaticLine_IsVertical(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4087,7 +4319,7 @@ static PyObject *_wrap_StaticLine_GetDefaultSize(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4119,16 +4351,22 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject * wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_StaticText",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_StaticText",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -4146,6 +4384,12 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -4225,17 +4469,23 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:StaticText_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:StaticText_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticText,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -4253,6 +4503,12 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -4267,7 +4523,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -4314,16 +4570,22 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "bitmap",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_StaticBitmap",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_StaticBitmap",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4340,6 +4602,12 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -4410,17 +4678,23 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj bool temp8 = 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 *) "parent",(char *) "id",(char *) "bitmap",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:StaticBitmap_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:StaticBitmap_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4437,6 +4711,12 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -4451,7 +4731,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -4562,7 +4842,7 @@ static PyObject * StaticBitmap_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ListBoxNameStr_set(PyObject *_val) { +static int _wrap_ListBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ListBoxNameStr is read-only."); return 1; } @@ -4602,17 +4882,23 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa wxSize temp4 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlOO:new_ListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg7,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:new_ListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -4632,6 +4918,12 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa if (arg6 == NULL) SWIG_fail; } } + if (obj5) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -4717,18 +5009,24 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlOO:ListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg8,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:ListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -4748,6 +5046,12 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -4768,7 +5072,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (arg7) delete [] arg7; } @@ -4798,18 +5102,23 @@ static PyObject *_wrap_ListBox_Insert(PyObject *self, PyObject *args, PyObject * bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|O:ListBox_Insert",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ListBox_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { arg4 = obj3; } @@ -4842,11 +5151,12 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "items",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListBox_InsertItems",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_InsertItems",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { if (! PySequence_Check(obj1)) { @@ -4867,6 +5177,10 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj Py_DECREF(str); } } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->InsertItems((wxArrayString const &)*arg2,arg3); @@ -4944,12 +5258,17 @@ static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_IsSelected",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_IsSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxListBox const *)arg1)->IsSelected(arg2); @@ -4957,7 +5276,7 @@ static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4970,16 +5289,21 @@ static PyObject *_wrap_ListBox_SetSelection(PyObject *self, PyObject *args, PyOb int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "select", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:ListBox_SetSelection",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListBox_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5002,12 +5326,17 @@ static PyObject *_wrap_ListBox_Select(PyObject *self, PyObject *args, PyObject * wxListBox *arg1 = (wxListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_Select",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_Select",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Select(arg2); @@ -5027,12 +5356,17 @@ static PyObject *_wrap_ListBox_Deselect(PyObject *self, PyObject *args, PyObject wxListBox *arg1 = (wxListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_Deselect",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_Deselect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Deselect(arg2); @@ -5052,12 +5386,19 @@ static PyObject *_wrap_ListBox_DeselectAll(PyObject *self, PyObject *args, PyObj wxListBox *arg1 = (wxListBox *) 0 ; int arg2 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "itemToLeaveSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:ListBox_DeselectAll",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ListBox_DeselectAll",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeselectAll(arg2); @@ -5095,7 +5436,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5106,7 +5447,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5151,12 +5492,17 @@ static PyObject *_wrap_ListBox_SetFirstItem(PyObject *self, PyObject *args, PyOb wxListBox *arg1 = (wxListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_SetFirstItem",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_SetFirstItem",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFirstItem(arg2); @@ -5216,12 +5562,17 @@ static PyObject *_wrap_ListBox_EnsureVisible(PyObject *self, PyObject *args, PyO wxListBox *arg1 = (wxListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_EnsureVisible",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_EnsureVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnsureVisible(arg2); @@ -5294,7 +5645,7 @@ static PyObject *_wrap_ListBox_IsSorted(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5328,17 +5679,23 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject wxSize temp4 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlOO:new_CheckListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg7,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:new_CheckListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -5358,6 +5715,12 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject if (arg6 == NULL) SWIG_fail; } } + if (obj5) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -5443,18 +5806,24 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlOO:CheckListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg8,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:CheckListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -5474,6 +5843,12 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -5494,7 +5869,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (arg7) delete [] arg7; } @@ -5521,12 +5896,17 @@ static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, Py int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CheckListBox_IsChecked",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckListBox_IsChecked",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsChecked(arg2); @@ -5534,7 +5914,7 @@ static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5547,12 +5927,24 @@ static PyObject *_wrap_CheckListBox_Check(PyObject *self, PyObject *args, PyObje int arg2 ; int arg3 = (int) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "check", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:CheckListBox_Check",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:CheckListBox_Check",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Check(arg2,arg3); @@ -5592,7 +5984,7 @@ static PyObject *_wrap_CheckListBox_HitTest(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5606,12 +5998,22 @@ static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *self, PyObject *args, Py int 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 *)"Oii:CheckListBox_HitTestXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:CheckListBox_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxCheckListBox const *)arg1)->HitTest(arg2,arg3); @@ -5619,7 +6021,7 @@ static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5633,7 +6035,7 @@ static PyObject * CheckListBox_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TextCtrlNameStr_set(PyObject *_val) { +static int _wrap_TextCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TextCtrlNameStr is read-only."); return 1; } @@ -5686,8 +6088,9 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O|OOi:new_TextAttr",&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O|OOO:new_TextAttr",&obj0,&obj1,&obj2,&obj3)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; @@ -5704,6 +6107,12 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } + if (obj3) { + { + arg4 = (wxTextAttrAlignment) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTextAttr *)new wxTextAttr((wxColour const &)*arg1,(wxColour const &)*arg2,(wxFont const &)*arg3,(wxTextAttrAlignment )arg4); @@ -5759,7 +6168,18 @@ static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args) { if (argc <= 3) { return _wrap_new_TextAttr__SWIG_1(self,args); } - return _wrap_new_TextAttr__SWIG_1(self,args); + { + SWIG_PyObj_AsInt(argv[3]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_TextAttr__SWIG_1(self,args); + } } } } @@ -5770,7 +6190,7 @@ static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args) { } -static PyObject *_wrap_TextAttr_Init(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_delete_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTextAttr *arg1 = (wxTextAttr *) 0 ; PyObject * obj0 = 0 ; @@ -5778,11 +6198,11 @@ static PyObject *_wrap_TextAttr_Init(PyObject *self, PyObject *args, PyObject *k (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TextAttr_Init",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TextAttr",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Init(); + delete arg1; wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5794,7 +6214,31 @@ static PyObject *_wrap_TextAttr_Init(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_TextAttr_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TextAttr_Init(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxTextAttr *arg1 = (wxTextAttr *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TextAttr_Init",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->Init(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_TextAttr_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTextAttr *arg1 = (wxTextAttr *) 0 ; wxColour *arg2 = 0 ; @@ -5863,16 +6307,23 @@ static PyObject *_wrap_TextAttr_SetFont(PyObject *self, PyObject *args, PyObject long arg3 = (long) wxTEXT_ATTR_FONT ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "font",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:TextAttr_SetFont",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TextAttr_SetFont",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFont((wxFont const &)*arg2,arg3); @@ -5892,12 +6343,17 @@ static PyObject *_wrap_TextAttr_SetAlignment(PyObject *self, PyObject *args, PyO wxTextAttr *arg1 = (wxTextAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TextAttr_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxTextAttrAlignment) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxTextAttrAlignment )arg2); @@ -5964,12 +6420,17 @@ static PyObject *_wrap_TextAttr_SetLeftIndent(PyObject *self, PyObject *args, Py wxTextAttr *arg1 = (wxTextAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "indent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TextAttr_SetLeftIndent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetLeftIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLeftIndent(arg2); @@ -5989,12 +6450,17 @@ static PyObject *_wrap_TextAttr_SetRightIndent(PyObject *self, PyObject *args, P wxTextAttr *arg1 = (wxTextAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "indent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TextAttr_SetRightIndent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetRightIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRightIndent(arg2); @@ -6014,12 +6480,17 @@ static PyObject *_wrap_TextAttr_SetFlags(PyObject *self, PyObject *args, PyObjec wxTextAttr *arg1 = (wxTextAttr *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextAttr_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -6052,7 +6523,7 @@ static PyObject *_wrap_TextAttr_HasTextColour(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6077,7 +6548,7 @@ static PyObject *_wrap_TextAttr_HasBackgroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6102,7 +6573,7 @@ static PyObject *_wrap_TextAttr_HasFont(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6127,7 +6598,7 @@ static PyObject *_wrap_TextAttr_HasAlignment(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6152,7 +6623,7 @@ static PyObject *_wrap_TextAttr_HasTabs(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6177,7 +6648,7 @@ static PyObject *_wrap_TextAttr_HasLeftIndent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6202,7 +6673,7 @@ static PyObject *_wrap_TextAttr_HasRightIndent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6215,12 +6686,17 @@ static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextAttr_HasFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_HasFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxTextAttr const *)arg1)->HasFlag(arg2); @@ -6228,7 +6704,7 @@ static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6337,7 +6813,7 @@ static PyObject *_wrap_TextAttr_GetAlignment(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6398,7 +6874,7 @@ static PyObject *_wrap_TextAttr_GetLeftIndent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -6423,7 +6899,7 @@ static PyObject *_wrap_TextAttr_GetRightIndent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -6448,7 +6924,7 @@ static PyObject *_wrap_TextAttr_GetFlags(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -6473,7 +6949,7 @@ static PyObject *_wrap_TextAttr_IsDefault(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6549,17 +7025,23 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlOO:new_TextCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:new_TextCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -6579,6 +7061,12 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -6671,18 +7159,24 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlOO:TextCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:TextCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -6702,6 +7196,12 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -6722,7 +7222,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -6823,12 +7323,22 @@ static PyObject *_wrap_TextCtrl_GetRange(PyObject *self, PyObject *args, PyObjec long arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:TextCtrl_GetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxTextCtrl const *)arg1)->GetRange(arg2,arg3); @@ -6855,12 +7365,17 @@ static PyObject *_wrap_TextCtrl_GetLineLength(PyObject *self, PyObject *args, Py long arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lineNo", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_GetLineLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_GetLineLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxTextCtrl const *)arg1)->GetLineLength(arg2); @@ -6868,7 +7383,7 @@ static PyObject *_wrap_TextCtrl_GetLineLength(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6881,12 +7396,17 @@ static PyObject *_wrap_TextCtrl_GetLineText(PyObject *self, PyObject *args, PyOb long arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lineNo", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_GetLineText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_GetLineText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxTextCtrl const *)arg1)->GetLineText(arg2); @@ -6925,7 +7445,7 @@ static PyObject *_wrap_TextCtrl_GetNumberOfLines(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6950,7 +7470,7 @@ static PyObject *_wrap_TextCtrl_IsModified(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6975,7 +7495,7 @@ static PyObject *_wrap_TextCtrl_IsEditable(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7000,7 +7520,7 @@ static PyObject *_wrap_TextCtrl_IsSingleLine(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7025,7 +7545,7 @@ static PyObject *_wrap_TextCtrl_IsMultiLine(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7133,13 +7653,23 @@ static PyObject *_wrap_TextCtrl_Replace(PyObject *self, PyObject *args, PyObject wxString *arg4 = 0 ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OllO:TextCtrl_Replace",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextCtrl_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -7173,12 +7703,22 @@ static PyObject *_wrap_TextCtrl_Remove(PyObject *self, PyObject *args, PyObject long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:TextCtrl_Remove",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_Remove",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Remove(arg2,arg3); @@ -7219,7 +7759,7 @@ static PyObject *_wrap_TextCtrl_LoadFile(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7263,7 +7803,7 @@ static PyObject *_wrap_TextCtrl_SaveFile(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7339,7 +7879,7 @@ static PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetMaxLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned long) SPyObj_AsUnsignedLong(obj1); + arg2 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -7460,7 +8000,7 @@ static PyObject *_wrap_TextCtrl_EmulateKeyPress(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7475,13 +8015,23 @@ static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObjec wxTextAttr *arg4 = 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "end",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OllO:TextCtrl_SetStyle",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextCtrl_SetStyle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -7493,7 +8043,7 @@ static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7507,13 +8057,18 @@ static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObjec wxTextAttr *arg3 = 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:TextCtrl_GetStyle",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetStyle",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -7525,7 +8080,7 @@ static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7556,7 +8111,7 @@ static PyObject *_wrap_TextCtrl_SetDefaultStyle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7598,12 +8153,22 @@ static PyObject *_wrap_TextCtrl_XYToPosition(PyObject *self, PyObject *args, PyO long arg3 ; long 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 *)"Oll:TextCtrl_XYToPosition",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_XYToPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxTextCtrl const *)arg1)->XYToPosition(arg2,arg3); @@ -7611,7 +8176,7 @@ static PyObject *_wrap_TextCtrl_XYToPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -7627,14 +8192,19 @@ static PyObject *_wrap_TextCtrl_PositionToXY(PyObject *self, PyObject *args, PyO long temp3 ; long temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; arg3 = &temp3; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_PositionToXY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_PositionToXY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxTextCtrl const *)arg1)->PositionToXY(arg2,arg3,arg4); @@ -7662,12 +8232,17 @@ static PyObject *_wrap_TextCtrl_ShowPosition(PyObject *self, PyObject *args, PyO wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_ShowPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_ShowPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ShowPosition(arg2); @@ -7772,7 +8347,7 @@ static PyObject *_wrap_TextCtrl_CanCopy(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7797,7 +8372,7 @@ static PyObject *_wrap_TextCtrl_CanCut(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7822,7 +8397,7 @@ static PyObject *_wrap_TextCtrl_CanPaste(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7895,7 +8470,7 @@ static PyObject *_wrap_TextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7920,7 +8495,7 @@ static PyObject *_wrap_TextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7932,12 +8507,17 @@ static PyObject *_wrap_TextCtrl_SetInsertionPoint(PyObject *self, PyObject *args wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_SetInsertionPoint",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetInsertionPoint",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInsertionPoint(arg2); @@ -7994,7 +8574,7 @@ static PyObject *_wrap_TextCtrl_GetInsertionPoint(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -8019,7 +8599,7 @@ static PyObject *_wrap_TextCtrl_GetLastPosition(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -8032,12 +8612,22 @@ static PyObject *_wrap_TextCtrl_SetSelection(PyObject *self, PyObject *args, PyO long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:TextCtrl_SetSelection",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -8089,7 +8679,7 @@ static PyObject *_wrap_TextCtrl_SetEditable(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetEditable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8153,12 +8743,22 @@ static PyObject *_wrap_TextCtrl_GetString(PyObject *self, PyObject *args, PyObje long arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:TextCtrl_GetString",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTextCtrl_GetString(arg1,arg2,arg3); @@ -8193,16 +8793,31 @@ static PyObject *_wrap_new_TextUrlEvent(PyObject *self, PyObject *args, PyObject long arg3 ; long arg4 ; wxTextUrlEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "evtMouse",(char *) "start",(char *) "end", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iOll:new_TextUrlEvent",kwnames,&arg1,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_TextUrlEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTextUrlEvent *)new wxTextUrlEvent(arg1,(wxMouseEvent const &)*arg2,arg3,arg4); @@ -8263,7 +8878,7 @@ static PyObject *_wrap_TextUrlEvent_GetURLStart(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -8288,7 +8903,7 @@ static PyObject *_wrap_TextUrlEvent_GetURLEnd(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -8302,7 +8917,7 @@ static PyObject * TextUrlEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ScrollBarNameStr_set(PyObject *_val) { +static int _wrap_ScrollBarNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ScrollBarNameStr is read-only."); return 1; } @@ -8340,16 +8955,24 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_ScrollBar",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_ScrollBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8362,6 +8985,12 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -8439,17 +9068,25 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:ScrollBar_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:ScrollBar_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8462,6 +9099,12 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -8482,7 +9125,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -8515,7 +9158,7 @@ static PyObject *_wrap_ScrollBar_GetThumbPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8540,7 +9183,7 @@ static PyObject *_wrap_ScrollBar_GetThumbSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8565,7 +9208,7 @@ static PyObject *_wrap_ScrollBar_GetPageSize(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8590,7 +9233,7 @@ static PyObject *_wrap_ScrollBar_GetRange(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8615,7 +9258,7 @@ static PyObject *_wrap_ScrollBar_IsVertical(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8627,12 +9270,17 @@ static PyObject *_wrap_ScrollBar_SetThumbPosition(PyObject *self, PyObject *args wxScrollBar *arg1 = (wxScrollBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "viewStart", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollBar_SetThumbPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollBar_SetThumbPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetThumbPosition(arg2); @@ -8656,16 +9304,36 @@ static PyObject *_wrap_ScrollBar_SetScrollbar(PyObject *self, PyObject *args, Py int arg5 ; bool arg6 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "thumbSize",(char *) "range",(char *) "pageSize",(char *) "refresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|O:ScrollBar_SetScrollbar",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:ScrollBar_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -8690,7 +9358,7 @@ static PyObject * ScrollBar_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_SPIN_BUTTON_NAME_set(PyObject *_val) { +static int _wrap_SPIN_BUTTON_NAME_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SPIN_BUTTON_NAME is read-only."); return 1; } @@ -8710,7 +9378,7 @@ static PyObject *_wrap_SPIN_BUTTON_NAME_get() { } -static int _wrap_SpinCtrlNameStr_set(PyObject *_val) { +static int _wrap_SpinCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SpinCtrlNameStr is read-only."); return 1; } @@ -8746,15 +9414,23 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject * 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 *)"O|iOOlO:new_SpinButton",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_SpinButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8767,6 +9443,12 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -8836,16 +9518,24 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:SpinButton_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:SpinButton_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8858,6 +9548,12 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -8872,7 +9568,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -8905,7 +9601,7 @@ static PyObject *_wrap_SpinButton_GetValue(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8930,7 +9626,7 @@ static PyObject *_wrap_SpinButton_GetMin(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8955,7 +9651,7 @@ static PyObject *_wrap_SpinButton_GetMax(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8967,12 +9663,17 @@ static PyObject *_wrap_SpinButton_SetValue(PyObject *self, PyObject *args, PyObj wxSpinButton *arg1 = (wxSpinButton *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinButton_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -8992,12 +9693,17 @@ static PyObject *_wrap_SpinButton_SetMin(PyObject *self, PyObject *args, PyObjec wxSpinButton *arg1 = (wxSpinButton *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinButton_SetMin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetMin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMin(arg2); @@ -9017,12 +9723,17 @@ static PyObject *_wrap_SpinButton_SetMax(PyObject *self, PyObject *args, PyObjec wxSpinButton *arg1 = (wxSpinButton *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "maxVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinButton_SetMax",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetMax",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMax(arg2); @@ -9043,12 +9754,22 @@ static PyObject *_wrap_SpinButton_SetRange(PyObject *self, PyObject *args, PyObj int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minVal",(char *) "maxVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:SpinButton_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinButton_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2,arg3); @@ -9081,7 +9802,7 @@ static PyObject *_wrap_SpinButton_IsVertical(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9117,17 +9838,28 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp10 = 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 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "style",(char *) "min",(char *) "max",(char *) "initial",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOOliiiO:new_SpinCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOOOO:new_SpinCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj2) { + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -9146,6 +9878,30 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { { arg10 = wxString_in_helper(obj9); @@ -9229,17 +9985,28 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject bool temp11 = 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 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; PyObject * obj10 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "style",(char *) "min",(char *) "max",(char *) "initial",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOOliiiO:SpinCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&arg8,&arg9,&arg10,&obj10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOOOOO:SpinCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -9259,6 +10026,30 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj9) { + { + arg10 = (int) SWIG_PyObj_AsInt(obj9); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj10) { { arg11 = wxString_in_helper(obj10); @@ -9273,7 +10064,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -9314,7 +10105,7 @@ static PyObject *_wrap_SpinCtrl_GetValue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9326,12 +10117,17 @@ static PyObject *_wrap_SpinCtrl_SetValue(PyObject *self, PyObject *args, PyObjec wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinCtrl_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinCtrl_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -9392,12 +10188,22 @@ static PyObject *_wrap_SpinCtrl_SetRange(PyObject *self, PyObject *args, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minVal",(char *) "maxVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:SpinCtrl_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinCtrl_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2,arg3); @@ -9430,7 +10236,7 @@ static PyObject *_wrap_SpinCtrl_GetMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9455,7 +10261,7 @@ static PyObject *_wrap_SpinCtrl_GetMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9468,12 +10274,22 @@ static PyObject *_wrap_SpinCtrl_SetSelection(PyObject *self, PyObject *args, PyO long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:SpinCtrl_SetSelection",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -9500,11 +10316,25 @@ static PyObject *_wrap_new_SpinEvent(PyObject *self, PyObject *args, PyObject *k wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxSpinEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SpinEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SpinEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSpinEvent *)new wxSpinEvent(arg1,arg2); @@ -9537,7 +10367,7 @@ static PyObject *_wrap_SpinEvent_GetPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9549,12 +10379,17 @@ static PyObject *_wrap_SpinEvent_SetPosition(PyObject *self, PyObject *args, PyO wxSpinEvent *arg1 = (wxSpinEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -9576,7 +10411,7 @@ static PyObject * SpinEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_RadioBoxNameStr_set(PyObject *_val) { +static int _wrap_RadioBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable RadioBoxNameStr is read-only."); return 1; } @@ -9596,7 +10431,7 @@ static PyObject *_wrap_RadioBoxNameStr_get() { } -static int _wrap_RadioButtonNameStr_set(PyObject *_val) { +static int _wrap_RadioButtonNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable RadioButtonNameStr is read-only."); return 1; } @@ -9639,18 +10474,25 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp10 = 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 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { - (char *) "parent",(char *) "id",(char *) "label",(char *) "point",(char *) "size",(char *) "choices",(char *) "majorDimension",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "choices",(char *) "majorDimension",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOOilOO:new_RadioBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&arg8,&arg9,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOO:new_RadioBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -9675,6 +10517,18 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg9 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj8) { if ((SWIG_ConvertPtr(obj8,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg10 == NULL) { @@ -9771,19 +10625,26 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject bool temp11 = 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 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; PyObject * obj10 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "point",(char *) "size",(char *) "choices",(char *) "majorDimension",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "choices",(char *) "majorDimension",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOOilOO:RadioBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&arg9,&arg10,&obj9,&obj10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOOOO:RadioBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -9808,6 +10669,18 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject if (arg8 == NULL) SWIG_fail; } } + if (obj7) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg10 = (long) SWIG_PyObj_AsLong(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { if ((SWIG_ConvertPtr(obj9,(void **) &arg11, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg11 == NULL) { @@ -9828,7 +10701,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -9862,12 +10735,17 @@ static PyObject *_wrap_RadioBox_SetSelection(PyObject *self, PyObject *args, PyO wxRadioBox *arg1 = (wxRadioBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:RadioBox_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -9900,7 +10778,7 @@ static PyObject *_wrap_RadioBox_GetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9964,7 +10842,7 @@ static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9997,7 +10875,7 @@ static PyObject *_wrap_RadioBox_GetCount(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10030,7 +10908,7 @@ static PyObject *_wrap_RadioBox_FindString(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -10051,12 +10929,17 @@ static PyObject *_wrap_RadioBox_GetString(PyObject *self, PyObject *args, PyObje int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:RadioBox_GetString",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_GetString",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxRadioBox const *)arg1)->GetString(arg2); @@ -10084,13 +10967,18 @@ static PyObject *_wrap_RadioBox_SetString(PyObject *self, PyObject *args, PyObje wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:RadioBox_SetString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RadioBox_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -10124,16 +11012,21 @@ static PyObject *_wrap_RadioBox_EnableItem(PyObject *self, PyObject *args, PyObj int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:RadioBox_EnableItem",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:RadioBox_EnableItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10157,16 +11050,21 @@ static PyObject *_wrap_RadioBox_ShowItem(PyObject *self, PyObject *args, PyObjec int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "show", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:RadioBox_ShowItem",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:RadioBox_ShowItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10202,7 +11100,7 @@ static PyObject *_wrap_RadioBox_GetColumnCount(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10227,7 +11125,7 @@ static PyObject *_wrap_RadioBox_GetRowCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10242,12 +11140,27 @@ static PyObject *_wrap_RadioBox_GetNextItem(PyObject *self, PyObject *args, PyOb long arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "dir",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiil:RadioBox_GetNextItem",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:RadioBox_GetNextItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (wxDirection) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRadioBox const *)arg1)->GetNextItem(arg2,(wxDirection )arg3,arg4); @@ -10255,7 +11168,7 @@ static PyObject *_wrap_RadioBox_GetNextItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10289,17 +11202,23 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_RadioButton",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_RadioButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -10317,6 +11236,12 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -10404,18 +11329,24 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:RadioButton_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:RadioButton_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -10433,6 +11364,12 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -10453,7 +11390,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -10494,7 +11431,7 @@ static PyObject *_wrap_RadioButton_GetValue(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10514,7 +11451,7 @@ static PyObject *_wrap_RadioButton_SetValue(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioButton_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -10538,7 +11475,7 @@ static PyObject * RadioButton_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_SliderNameStr_set(PyObject *_val) { +static int _wrap_SliderNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SliderNameStr is read-only."); return 1; } @@ -10579,16 +11516,37 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar wxSize temp7 ; bool temp10 = 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 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { - (char *) "parent",(char *) "id",(char *) "value",(char *) "minValue",(char *) "maxValue",(char *) "point",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "parent",(char *) "id",(char *) "value",(char *) "minValue",(char *) "maxValue",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|OOlOO:new_Slider",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&arg8,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOOOO:new_Slider",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { arg6 = &temp6; @@ -10601,6 +11559,12 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj6, &arg7)) SWIG_fail; } } + if (obj7) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj8) { if ((SWIG_ConvertPtr(obj8,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -10681,17 +11645,38 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k bool temp11 = 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 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; PyObject * obj10 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "minValue",(char *) "maxValue",(char *) "point",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "minValue",(char *) "maxValue",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiiii|OOlOO:Slider_Create",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6,&obj7,&arg9,&obj9,&obj10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|OOOOO:Slider_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { arg7 = &temp7; @@ -10704,6 +11689,12 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj7, &arg8)) SWIG_fail; } } + if (obj8) { + { + arg9 = (long) SWIG_PyObj_AsLong(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { if ((SWIG_ConvertPtr(obj9,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg10 == NULL) { @@ -10724,7 +11715,7 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp11) delete arg11; @@ -10757,7 +11748,7 @@ static PyObject *_wrap_Slider_GetValue(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10769,12 +11760,17 @@ static PyObject *_wrap_Slider_SetValue(PyObject *self, PyObject *args, PyObject wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -10795,12 +11791,22 @@ static PyObject *_wrap_Slider_SetRange(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minValue",(char *) "maxValue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Slider_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Slider_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2,arg3); @@ -10833,7 +11839,7 @@ static PyObject *_wrap_Slider_GetMin(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10858,7 +11864,7 @@ static PyObject *_wrap_Slider_GetMax(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10870,12 +11876,17 @@ static PyObject *_wrap_Slider_SetMin(PyObject *self, PyObject *args, PyObject *k wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minValue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetMin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetMin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMin(arg2); @@ -10895,12 +11906,17 @@ static PyObject *_wrap_Slider_SetMax(PyObject *self, PyObject *args, PyObject *k wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "maxValue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetMax",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetMax",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMax(arg2); @@ -10920,12 +11936,17 @@ static PyObject *_wrap_Slider_SetLineSize(PyObject *self, PyObject *args, PyObje wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lineSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetLineSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetLineSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLineSize(arg2); @@ -10945,12 +11966,17 @@ static PyObject *_wrap_Slider_SetPageSize(PyObject *self, PyObject *args, PyObje wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetPageSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetPageSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPageSize(arg2); @@ -10983,7 +12009,7 @@ static PyObject *_wrap_Slider_GetLineSize(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11008,7 +12034,7 @@ static PyObject *_wrap_Slider_GetPageSize(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11020,12 +12046,17 @@ static PyObject *_wrap_Slider_SetThumbLength(PyObject *self, PyObject *args, PyO wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lenPixels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetThumbLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetThumbLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetThumbLength(arg2); @@ -11058,7 +12089,7 @@ static PyObject *_wrap_Slider_GetThumbLength(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11069,14 +12100,26 @@ static PyObject *_wrap_Slider_SetTickFreq(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; - int arg3 ; + int arg3 = (int) 1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Slider_SetTickFreq",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Slider_SetTickFreq",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTickFreq(arg2,arg3); @@ -11109,7 +12152,7 @@ static PyObject *_wrap_Slider_GetTickFreq(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11145,12 +12188,17 @@ static PyObject *_wrap_Slider_SetTick(PyObject *self, PyObject *args, PyObject * wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "tickPos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetTick",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetTick",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTick(arg2); @@ -11207,7 +12255,7 @@ static PyObject *_wrap_Slider_GetSelEnd(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11232,7 +12280,7 @@ static PyObject *_wrap_Slider_GetSelStart(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11245,12 +12293,22 @@ static PyObject *_wrap_Slider_SetSelection(PyObject *self, PyObject *args, PyObj int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Slider_SetSelection",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Slider_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -11272,7 +12330,7 @@ static PyObject * Slider_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ToggleButtonNameStr_set(PyObject *_val) { +static int _wrap_ToggleButtonNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ToggleButtonNameStr is read-only."); return 1; } @@ -11312,17 +12370,23 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_ToggleButton",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_ToggleButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -11340,6 +12404,12 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -11412,7 +12482,7 @@ static PyObject * ToggleButton_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_NOTEBOOK_NAME_set(PyObject *_val) { +static int _wrap_NOTEBOOK_NAME_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NOTEBOOK_NAME is read-only."); return 1; } @@ -11450,7 +12520,7 @@ static PyObject *_wrap_BookCtrl_GetPageCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -11471,7 +12541,7 @@ static PyObject *_wrap_BookCtrl_GetPage(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11508,7 +12578,7 @@ static PyObject *_wrap_BookCtrl_GetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11532,7 +12602,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BookCtrl_SetPageText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11547,7 +12617,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -11576,7 +12646,7 @@ static PyObject *_wrap_BookCtrl_GetPageText(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPageText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11694,7 +12764,7 @@ static PyObject *_wrap_BookCtrl_GetPageImage(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPageImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11704,7 +12774,7 @@ static PyObject *_wrap_BookCtrl_GetPageImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11719,14 +12789,19 @@ static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyO bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:BookCtrl_SetPageImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BookCtrl_SetPageImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -11736,7 +12811,7 @@ static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11824,7 +12899,7 @@ static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_DeletePage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11834,7 +12909,7 @@ static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11855,7 +12930,7 @@ static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_RemovePage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11865,7 +12940,7 @@ static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11890,7 +12965,7 @@ static PyObject *_wrap_BookCtrl_DeleteAllPages(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11910,11 +12985,12 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|Oi:BookCtrl_AddPage",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:BookCtrl_AddPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -11924,7 +13000,13 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); if (PyErr_Occurred()) SWIG_fail; } } @@ -11935,7 +13017,7 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -11965,14 +13047,15 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|Oi:BookCtrl_InsertPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:BookCtrl_InsertPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -11983,7 +13066,13 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -11994,7 +13083,7 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -12023,7 +13112,7 @@ static PyObject *_wrap_BookCtrl_SetSelection(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12033,7 +13122,7 @@ static PyObject *_wrap_BookCtrl_SetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12054,7 +13143,7 @@ static PyObject *_wrap_BookCtrl_AdvanceSelection(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -12086,11 +13175,39 @@ static PyObject *_wrap_new_BookCtrlEvent(PyObject *self, PyObject *args, PyObjec int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxBookCtrlEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_BookCtrlEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_BookCtrlEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBookCtrlEvent *)new wxBookCtrlEvent(arg1,arg2,arg3,arg4); @@ -12123,7 +13240,7 @@ static PyObject *_wrap_BookCtrlEvent_GetSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12135,12 +13252,17 @@ static PyObject *_wrap_BookCtrlEvent_SetSelection(PyObject *self, PyObject *args wxBookCtrlEvent *arg1 = (wxBookCtrlEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "nSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:BookCtrlEvent_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlEvent_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrlEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -12173,7 +13295,7 @@ static PyObject *_wrap_BookCtrlEvent_GetOldSelection(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12185,12 +13307,17 @@ static PyObject *_wrap_BookCtrlEvent_SetOldSelection(PyObject *self, PyObject *a wxBookCtrlEvent *arg1 = (wxBookCtrlEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:BookCtrlEvent_SetOldSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlEvent_SetOldSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrlEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOldSelection(arg2); @@ -12228,15 +13355,21 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw 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 *)"Oi|OOlO:new_Notebook",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Notebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -12249,6 +13382,12 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -12322,16 +13461,22 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Notebook_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Notebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNotebook,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -12344,6 +13489,12 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -12358,7 +13509,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -12391,7 +13542,7 @@ static PyObject *_wrap_Notebook_GetRowCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12488,7 +13639,7 @@ static PyObject *_wrap_Notebook_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -12549,11 +13700,39 @@ static PyObject *_wrap_new_NotebookEvent(PyObject *self, PyObject *args, PyObjec int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxNotebookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_NotebookEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_NotebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNotebookEvent *)new wxNotebookEvent(arg1,arg2,arg3,arg4); @@ -12591,15 +13770,21 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw 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 *)"Oi|OOlO:new_Listbook",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Listbook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -12612,6 +13797,12 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -12681,16 +13872,22 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Listbook_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Listbook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListbook,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -12703,6 +13900,12 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -12717,7 +13920,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -12750,7 +13953,7 @@ static PyObject *_wrap_Listbook_IsVertical(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12771,11 +13974,39 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *self, PyObject *args, PyObjec int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxListbookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_ListbookEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxListbookEvent *)new wxListbookEvent(arg1,arg2,arg3,arg4); @@ -13037,7 +14268,7 @@ static PyObject *_wrap_ToolBarToolBase_GetId(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13116,7 +14347,7 @@ static PyObject *_wrap_ToolBarToolBase_IsButton(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13141,7 +14372,7 @@ static PyObject *_wrap_ToolBarToolBase_IsControl(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13166,7 +14397,7 @@ static PyObject *_wrap_ToolBarToolBase_IsSeparator(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13191,7 +14422,7 @@ static PyObject *_wrap_ToolBarToolBase_GetStyle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13216,7 +14447,7 @@ static PyObject *_wrap_ToolBarToolBase_GetKind(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13241,7 +14472,7 @@ static PyObject *_wrap_ToolBarToolBase_IsEnabled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13266,7 +14497,7 @@ static PyObject *_wrap_ToolBarToolBase_IsToggled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13291,7 +14522,7 @@ static PyObject *_wrap_ToolBarToolBase_CanBeToggled(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13490,7 +14721,7 @@ static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarToolBase_Enable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarToolBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13500,7 +14731,7 @@ static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13545,7 +14776,7 @@ static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarToolBase_SetToggle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarToolBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13555,7 +14786,7 @@ static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13588,7 +14819,7 @@ static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -13629,7 +14860,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -13873,9 +15104,11 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO bool temp7 = False ; bool temp8 = 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 ; PyObject * obj8 = 0 ; @@ -13883,8 +15116,12 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO (char *) "self",(char *) "id",(char *) "label",(char *) "bitmap",(char *) "bmpDisabled",(char *) "kind",(char *) "shortHelp",(char *) "longHelp",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|OiOOO:ToolBarBase_DoAddTool",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:ToolBarBase_DoAddTool",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -13900,6 +15137,12 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } + if (obj5) { + { + arg6 = (wxItemKind) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -13978,9 +15221,11 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args, bool temp9 = 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 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; @@ -13988,10 +15233,14 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args, (char *) "self",(char *) "pos",(char *) "id",(char *) "label",(char *) "bitmap",(char *) "bmpDisabled",(char *) "kind",(char *) "shortHelp",(char *) "longHelp",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiOO|OiOOO:ToolBarBase_DoInsertTool",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOOOO:ToolBarBase_DoInsertTool",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14009,6 +15258,12 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } + if (obj6) { + { + arg7 = (wxItemKind) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -14112,7 +15367,7 @@ static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_InsertToolItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxToolBarToolBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -14178,7 +15433,7 @@ static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_InsertControl",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -14204,12 +15459,17 @@ static PyObject *_wrap_ToolBarBase_FindControl(PyObject *self, PyObject *args, P int arg2 ; wxControl *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_FindControl",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_FindControl",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxControl *)(arg1)->FindControl(arg2); @@ -14267,7 +15527,7 @@ static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_InsertSeparator",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -14292,12 +15552,17 @@ static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *self, PyObject *args, Py int arg2 ; wxToolBarToolBase *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_RemoveTool",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_RemoveTool",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)(arg1)->RemoveTool(arg2); @@ -14328,7 +15593,7 @@ static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_DeleteToolByPos",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -14338,7 +15603,7 @@ static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14351,12 +15616,17 @@ static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, Py int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_DeleteTool",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_DeleteTool",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteTool(arg2); @@ -14364,7 +15634,7 @@ static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14413,7 +15683,7 @@ static PyObject *_wrap_ToolBarBase_Realize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14426,15 +15696,20 @@ static PyObject *_wrap_ToolBarBase_EnableTool(PyObject *self, PyObject *args, Py int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_EnableTool",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_EnableTool",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14457,15 +15732,20 @@ static PyObject *_wrap_ToolBarBase_ToggleTool(PyObject *self, PyObject *args, Py int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "toggle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_ToggleTool",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_ToggleTool",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14488,15 +15768,20 @@ static PyObject *_wrap_ToolBarBase_SetToggle(PyObject *self, PyObject *args, PyO int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "toggle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_SetToggle",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToggle",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14519,12 +15804,17 @@ static PyObject *_wrap_ToolBarBase_GetToolClientData(PyObject *self, PyObject *a int arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolClientData",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolClientData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxToolBarBase_GetToolClientData(arg1,arg2); @@ -14545,13 +15835,18 @@ static PyObject *_wrap_ToolBarBase_SetToolClientData(PyObject *self, PyObject *a int arg2 ; PyObject *arg3 = (PyObject *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_SetToolClientData",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolClientData",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14573,12 +15868,17 @@ static PyObject *_wrap_ToolBarBase_GetToolPos(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolPos",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolPos",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxToolBarBase const *)arg1)->GetToolPos(arg2); @@ -14586,7 +15886,7 @@ static PyObject *_wrap_ToolBarBase_GetToolPos(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14599,12 +15899,17 @@ static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args, int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolState",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolState",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetToolState(arg2); @@ -14612,7 +15917,7 @@ static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14625,12 +15930,17 @@ static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolEnabled",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetToolEnabled(arg2); @@ -14638,7 +15948,7 @@ static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14652,13 +15962,18 @@ static PyObject *_wrap_ToolBarBase_SetToolShortHelp(PyObject *self, PyObject *ar wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_SetToolShortHelp",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolShortHelp",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -14692,12 +16007,17 @@ static PyObject *_wrap_ToolBarBase_GetToolShortHelp(PyObject *self, PyObject *ar int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolShortHelp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolShortHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetToolShortHelp(arg2); @@ -14725,13 +16045,18 @@ static PyObject *_wrap_ToolBarBase_SetToolLongHelp(PyObject *self, PyObject *arg wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_SetToolLongHelp",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolLongHelp",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -14765,12 +16090,17 @@ static PyObject *_wrap_ToolBarBase_GetToolLongHelp(PyObject *self, PyObject *arg int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolLongHelp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolLongHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetToolLongHelp(arg2); @@ -14797,12 +16127,22 @@ static PyObject *_wrap_ToolBarBase_SetMarginsXY(PyObject *self, PyObject *args, int arg2 ; int 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 *)"Oii:ToolBarBase_SetMarginsXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetMarginsXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -14853,12 +16193,17 @@ static PyObject *_wrap_ToolBarBase_SetToolPacking(PyObject *self, PyObject *args wxToolBarBase *arg1 = (wxToolBarBase *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "packing", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_SetToolPacking",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetToolPacking",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToolPacking(arg2); @@ -14878,12 +16223,17 @@ static PyObject *_wrap_ToolBarBase_SetToolSeparation(PyObject *self, PyObject *a wxToolBarBase *arg1 = (wxToolBarBase *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "separation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_SetToolSeparation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetToolSeparation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToolSeparation(arg2); @@ -14974,7 +16324,7 @@ static PyObject *_wrap_ToolBarBase_GetToolPacking(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14999,7 +16349,7 @@ static PyObject *_wrap_ToolBarBase_GetToolSeparation(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15011,12 +16361,17 @@ static PyObject *_wrap_ToolBarBase_SetRows(PyObject *self, PyObject *args, PyObj wxToolBarBase *arg1 = (wxToolBarBase *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "nRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_SetRows",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetRows",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRows(arg2); @@ -15037,12 +16392,22 @@ static PyObject *_wrap_ToolBarBase_SetMaxRowsCols(PyObject *self, PyObject *args int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rows",(char *) "cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ToolBarBase_SetMaxRowsCols",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetMaxRowsCols",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaxRowsCols(arg2,arg3); @@ -15075,7 +16440,7 @@ static PyObject *_wrap_ToolBarBase_GetMaxRows(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15100,7 +16465,7 @@ static PyObject *_wrap_ToolBarBase_GetMaxCols(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15203,12 +16568,22 @@ static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *self, PyObject int arg3 ; wxToolBarToolBase *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 *)"Oii:ToolBarBase_FindToolForPosition",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)(arg1)->FindToolForPosition(arg2,arg3); @@ -15231,12 +16606,17 @@ static PyObject *_wrap_ToolBarBase_FindById(PyObject *self, PyObject *args, PyOb int arg2 ; wxToolBarToolBase *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "toolid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_FindById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_FindById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)((wxToolBarBase const *)arg1)->FindById(arg2); @@ -15271,7 +16651,7 @@ static PyObject *_wrap_ToolBarBase_IsVertical(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15301,15 +16681,21 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa 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 *)"Oi|OOlO:new_ToolBar",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_ToolBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -15322,6 +16708,12 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -15395,16 +16787,22 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject * bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:ToolBar_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:ToolBar_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -15417,6 +16815,12 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -15431,7 +16835,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -15453,12 +16857,22 @@ static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *self, PyObject *arg int arg3 ; wxToolBarToolBase *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 *)"Oii:ToolBar_FindToolForPosition",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)(arg1)->FindToolForPosition(arg2,arg3); @@ -15482,7 +16896,7 @@ static PyObject * ToolBar_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ListCtrlNameStr_set(PyObject *_val) { +static int _wrap_ListCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ListCtrlNameStr is read-only."); return 1; } @@ -15663,7 +17077,7 @@ static PyObject *_wrap_ListItemAttr_HasTextColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15688,7 +17102,7 @@ static PyObject *_wrap_ListItemAttr_HasBackgroundColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15713,7 +17127,7 @@ static PyObject *_wrap_ListItemAttr_HasFont(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15939,12 +17353,17 @@ static PyObject *_wrap_ListItem_SetMask(PyObject *self, PyObject *args, PyObject wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetMask",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetMask",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMask(arg2); @@ -15964,12 +17383,17 @@ static PyObject *_wrap_ListItem_SetId(PyObject *self, PyObject *args, PyObject * wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -15989,12 +17413,17 @@ static PyObject *_wrap_ListItem_SetColumn(PyObject *self, PyObject *args, PyObje wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_SetColumn",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumn(arg2); @@ -16014,12 +17443,17 @@ static PyObject *_wrap_ListItem_SetState(PyObject *self, PyObject *args, PyObjec wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetState",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetState",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetState(arg2); @@ -16039,12 +17473,17 @@ static PyObject *_wrap_ListItem_SetStateMask(PyObject *self, PyObject *args, PyO wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stateMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetStateMask",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetStateMask",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStateMask(arg2); @@ -16104,12 +17543,17 @@ static PyObject *_wrap_ListItem_SetImage(PyObject *self, PyObject *args, PyObjec wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_SetImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetImage(arg2); @@ -16129,12 +17573,17 @@ static PyObject *_wrap_ListItem_SetData(PyObject *self, PyObject *args, PyObject wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetData",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetData(arg2); @@ -16154,12 +17603,17 @@ static PyObject *_wrap_ListItem_SetWidth(PyObject *self, PyObject *args, PyObjec wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -16179,12 +17633,17 @@ static PyObject *_wrap_ListItem_SetAlign(PyObject *self, PyObject *args, PyObjec wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_SetAlign",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetAlign",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxListColumnFormat) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlign((wxListColumnFormat )arg2); @@ -16309,7 +17768,7 @@ static PyObject *_wrap_ListItem_GetMask(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16334,7 +17793,7 @@ static PyObject *_wrap_ListItem_GetId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16359,7 +17818,7 @@ static PyObject *_wrap_ListItem_GetColumn(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16384,7 +17843,7 @@ static PyObject *_wrap_ListItem_GetState(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16443,7 +17902,7 @@ static PyObject *_wrap_ListItem_GetImage(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16468,7 +17927,7 @@ static PyObject *_wrap_ListItem_GetData(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16493,7 +17952,7 @@ static PyObject *_wrap_ListItem_GetWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16518,7 +17977,7 @@ static PyObject *_wrap_ListItem_GetAlign(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16568,7 +18027,7 @@ static PyObject *_wrap_ListItem_HasAttributes(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16667,12 +18126,17 @@ static PyObject *_wrap_ListItem_m_mask_set(PyObject *self, PyObject *args, PyObj wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_mask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_mask_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_mask_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_mask = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -16695,7 +18159,7 @@ static PyObject *_wrap_ListItem_m_mask_get(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_mask); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16707,12 +18171,17 @@ static PyObject *_wrap_ListItem_m_itemId_set(PyObject *self, PyObject *args, PyO wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_itemId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_itemId_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_itemId_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_itemId = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -16735,7 +18204,7 @@ static PyObject *_wrap_ListItem_m_itemId_get(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_itemId); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16747,12 +18216,17 @@ static PyObject *_wrap_ListItem_m_col_set(PyObject *self, PyObject *args, PyObje wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_m_col_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_col_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_col = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -16775,7 +18249,7 @@ static PyObject *_wrap_ListItem_m_col_get(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_col); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16787,12 +18261,17 @@ static PyObject *_wrap_ListItem_m_state_set(PyObject *self, PyObject *args, PyOb wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_state_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_state_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_state = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -16815,7 +18294,7 @@ static PyObject *_wrap_ListItem_m_state_get(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_state); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16827,12 +18306,17 @@ static PyObject *_wrap_ListItem_m_stateMask_set(PyObject *self, PyObject *args, wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_stateMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_stateMask_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_stateMask_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_stateMask = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -16855,7 +18339,7 @@ static PyObject *_wrap_ListItem_m_stateMask_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_stateMask); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16928,12 +18412,17 @@ static PyObject *_wrap_ListItem_m_image_set(PyObject *self, PyObject *args, PyOb wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_m_image_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_image_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_image = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -16956,7 +18445,7 @@ static PyObject *_wrap_ListItem_m_image_get(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_image); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16968,12 +18457,17 @@ static PyObject *_wrap_ListItem_m_data_set(PyObject *self, PyObject *args, PyObj wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_data_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_data_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_data = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -16996,7 +18490,7 @@ static PyObject *_wrap_ListItem_m_data_get(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_data); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17008,12 +18502,17 @@ static PyObject *_wrap_ListItem_m_format_set(PyObject *self, PyObject *args, PyO wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_format", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_m_format_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_format_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_format = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17036,7 +18535,7 @@ static PyObject *_wrap_ListItem_m_format_get(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_format); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17048,12 +18547,17 @@ static PyObject *_wrap_ListItem_m_width_set(PyObject *self, PyObject *args, PyOb wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_m_width_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_width_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_width = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17076,7 +18580,7 @@ static PyObject *_wrap_ListItem_m_width_get(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_width); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17095,11 +18599,25 @@ static PyObject *_wrap_new_ListEvent(PyObject *self, PyObject *args, PyObject *k wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxListEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_ListEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_ListEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxListEvent *)new wxListEvent(arg1,arg2); @@ -17119,12 +18637,17 @@ static PyObject *_wrap_ListEvent_m_code_set(PyObject *self, PyObject *args, PyOb wxListEvent *arg1 = (wxListEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_code", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListEvent_m_code_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_code_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_code = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17147,7 +18670,7 @@ static PyObject *_wrap_ListEvent_m_code_get(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_code); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17159,12 +18682,17 @@ static PyObject *_wrap_ListEvent_m_oldItemIndex_set(PyObject *self, PyObject *ar wxListEvent *arg1 = (wxListEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_oldItemIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListEvent_m_oldItemIndex_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_oldItemIndex_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_oldItemIndex = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17187,7 +18715,7 @@ static PyObject *_wrap_ListEvent_m_oldItemIndex_get(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_oldItemIndex); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17199,12 +18727,17 @@ static PyObject *_wrap_ListEvent_m_itemIndex_set(PyObject *self, PyObject *args, wxListEvent *arg1 = (wxListEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_itemIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListEvent_m_itemIndex_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_itemIndex_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_itemIndex = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17227,7 +18760,7 @@ static PyObject *_wrap_ListEvent_m_itemIndex_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_itemIndex); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17239,12 +18772,17 @@ static PyObject *_wrap_ListEvent_m_col_set(PyObject *self, PyObject *args, PyObj wxListEvent *arg1 = (wxListEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListEvent_m_col_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_col_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_col = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17267,7 +18805,7 @@ static PyObject *_wrap_ListEvent_m_col_get(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_col); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17356,7 +18894,7 @@ static PyObject *_wrap_ListEvent_GetKeyCode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17381,7 +18919,7 @@ static PyObject *_wrap_ListEvent_GetIndex(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17406,7 +18944,7 @@ static PyObject *_wrap_ListEvent_GetColumn(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17528,7 +19066,7 @@ static PyObject *_wrap_ListEvent_GetImage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17553,7 +19091,7 @@ static PyObject *_wrap_ListEvent_GetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17578,7 +19116,7 @@ static PyObject *_wrap_ListEvent_GetMask(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17631,7 +19169,7 @@ static PyObject *_wrap_ListEvent_GetCacheFrom(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17656,7 +19194,7 @@ static PyObject *_wrap_ListEvent_GetCacheTo(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17681,7 +19219,7 @@ static PyObject *_wrap_ListEvent_IsEditCancelled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17701,7 +19239,7 @@ static PyObject *_wrap_ListEvent_SetEditCanceled(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_SetEditCanceled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17743,16 +19281,24 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_ListCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_ListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -17765,6 +19311,12 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -17842,17 +19394,25 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:ListCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:ListCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -17865,6 +19425,12 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -17885,7 +19451,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -17955,7 +19521,7 @@ static PyObject *_wrap_ListCtrl_SetForegroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17987,7 +19553,7 @@ static PyObject *_wrap_ListCtrl_SetBackgroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18000,12 +19566,17 @@ static PyObject *_wrap_ListCtrl_GetColumn(PyObject *self, PyObject *args, PyObje int arg2 ; wxListItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListCtrl_GetColumn",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxListItem *)wxPyListCtrl_GetColumn(arg1,arg2); @@ -18029,13 +19600,18 @@ static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObje wxListItem *arg3 = 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ListCtrl_SetColumn",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -18047,7 +19623,7 @@ static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18060,12 +19636,17 @@ static PyObject *_wrap_ListCtrl_GetColumnWidth(PyObject *self, PyObject *args, P int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListCtrl_GetColumnWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyListCtrl const *)arg1)->GetColumnWidth(arg2); @@ -18073,7 +19654,7 @@ static PyObject *_wrap_ListCtrl_GetColumnWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18087,12 +19668,22 @@ static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, P int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ListCtrl_SetColumnWidth",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetColumnWidth(arg2,arg3); @@ -18100,7 +19691,7 @@ static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18125,7 +19716,7 @@ static PyObject *_wrap_ListCtrl_GetCountPerPage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18168,12 +19759,24 @@ static PyObject *_wrap_ListCtrl_GetItem(PyObject *self, PyObject *args, PyObject int arg3 = (int) 0 ; wxListItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "itemId",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|i:ListCtrl_GetItem",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_GetItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxListItem *)wxPyListCtrl_GetItem(arg1,arg2,arg3); @@ -18214,7 +19817,7 @@ static PyObject *_wrap_ListCtrl_SetItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18231,18 +19834,35 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py long result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "col",(char *) "label",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OliO|i:ListCtrl_SetStringItem",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:ListCtrl_SetStringItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->SetItem(arg2,arg3,(wxString const &)*arg4,arg5); @@ -18250,7 +19870,7 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp4) delete arg4; @@ -18272,12 +19892,22 @@ static PyObject *_wrap_ListCtrl_GetItemState(PyObject *self, PyObject *args, PyO long arg3 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "stateMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ListCtrl_GetItemState",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_GetItemState",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyListCtrl const *)arg1)->GetItemState(arg2,arg3); @@ -18285,7 +19915,7 @@ static PyObject *_wrap_ListCtrl_GetItemState(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18300,12 +19930,27 @@ static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyO long arg4 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "state",(char *) "stateMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Olll:ListCtrl_SetItemState",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_SetItemState",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetItemState(arg2,arg3,arg4); @@ -18313,7 +19958,7 @@ static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18328,12 +19973,27 @@ static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyO int arg4 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "image",(char *) "selImage", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Olii:ListCtrl_SetItemImage",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_SetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetItemImage(arg2,arg3,arg4); @@ -18341,7 +20001,7 @@ static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18354,12 +20014,17 @@ static PyObject *_wrap_ListCtrl_GetItemText(PyObject *self, PyObject *args, PyOb long arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyListCtrl const *)arg1)->GetItemText(arg2); @@ -18387,13 +20052,18 @@ static PyObject *_wrap_ListCtrl_SetItemText(PyObject *self, PyObject *args, PyOb wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "str", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_SetItemText",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -18427,12 +20097,17 @@ static PyObject *_wrap_ListCtrl_GetItemData(PyObject *self, PyObject *args, PyOb long arg2 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemData",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxPyListCtrl const *)arg1)->GetItemData(arg2); @@ -18440,7 +20115,7 @@ static PyObject *_wrap_ListCtrl_GetItemData(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18454,12 +20129,22 @@ static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyOb long arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ListCtrl_SetItemData",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemData",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetItemData(arg2,arg3); @@ -18467,7 +20152,7 @@ static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18480,12 +20165,17 @@ static PyObject *_wrap_ListCtrl_GetItemPosition(PyObject *self, PyObject *args, long arg2 ; wxPoint result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxPyListCtrl_GetItemPosition(arg1,arg2); @@ -18511,12 +20201,24 @@ static PyObject *_wrap_ListCtrl_GetItemRect(PyObject *self, PyObject *args, PyOb int arg3 = (int) wxLIST_RECT_BOUNDS ; wxRect result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "code", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|i:ListCtrl_GetItemRect",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_GetItemRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxPyListCtrl_GetItemRect(arg1,arg2,arg3); @@ -18543,13 +20245,18 @@ static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args, bool result; wxPoint temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_SetItemPosition",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; @@ -18561,7 +20268,7 @@ static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18586,7 +20293,7 @@ static PyObject *_wrap_ListCtrl_GetItemCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18611,7 +20318,7 @@ static PyObject *_wrap_ListCtrl_GetColumnCount(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18653,16 +20360,21 @@ static PyObject *_wrap_ListCtrl_SetItemSpacing(PyObject *self, PyObject *args, P int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spacing",(char *) "isSmall", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:ListCtrl_SetItemSpacing",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_SetItemSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -18698,7 +20410,7 @@ static PyObject *_wrap_ListCtrl_GetSelectedItemCount(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18783,7 +20495,7 @@ static PyObject *_wrap_ListCtrl_GetTopItem(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18796,16 +20508,21 @@ static PyObject *_wrap_ListCtrl_SetSingleStyle(PyObject *self, PyObject *args, P long arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style",(char *) "add", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|O:ListCtrl_SetSingleStyle",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_SetSingleStyle",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -18828,12 +20545,17 @@ static PyObject *_wrap_ListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *arg wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_SetWindowStyleFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindowStyleFlag(arg2); @@ -18856,12 +20578,31 @@ static PyObject *_wrap_ListCtrl_GetNextItem(PyObject *self, PyObject *args, PyOb int arg4 = (int) wxLIST_STATE_DONTCARE ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "geometry",(char *) "state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:ListCtrl_GetNextItem",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:ListCtrl_GetNextItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxPyListCtrl const *)arg1)->GetNextItem(arg2,arg3,arg4); @@ -18869,7 +20610,7 @@ static PyObject *_wrap_ListCtrl_GetNextItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18882,12 +20623,17 @@ static PyObject *_wrap_ListCtrl_GetImageList(PyObject *self, PyObject *args, PyO int arg2 ; wxImageList *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListCtrl_GetImageList",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImageList *)((wxPyListCtrl const *)arg1)->GetImageList(arg2); @@ -18911,13 +20657,18 @@ static PyObject *_wrap_ListCtrl_SetImageList(PyObject *self, PyObject *args, PyO int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "imageList",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListCtrl_SetImageList",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetImageList",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetImageList(arg2,arg3); @@ -18939,13 +20690,18 @@ static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args, int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "imageList",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListCtrl_AssignImageList",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_AssignImageList",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2,arg3); @@ -18978,7 +20734,7 @@ static PyObject *_wrap_ListCtrl_IsVirtual(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18990,12 +20746,17 @@ static PyObject *_wrap_ListCtrl_RefreshItem(PyObject *self, PyObject *args, PyOb wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_RefreshItem",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_RefreshItem",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RefreshItem(arg2); @@ -19016,12 +20777,22 @@ static PyObject *_wrap_ListCtrl_RefreshItems(PyObject *self, PyObject *args, PyO long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "itemFrom",(char *) "itemTo", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ListCtrl_RefreshItems",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_RefreshItems",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RefreshItems(arg2,arg3); @@ -19042,12 +20813,19 @@ static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject int arg2 = (int) wxLIST_ALIGN_DEFAULT ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:ListCtrl_Arrange",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ListCtrl_Arrange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Arrange(arg2); @@ -19055,7 +20833,7 @@ static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19068,12 +20846,17 @@ static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObj long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_DeleteItem",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_DeleteItem",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteItem(arg2); @@ -19081,7 +20864,7 @@ static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19106,7 +20889,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllItems(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19119,12 +20902,17 @@ static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyO int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListCtrl_DeleteColumn",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_DeleteColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteColumn(arg2); @@ -19132,7 +20920,7 @@ static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19157,7 +20945,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllColumns(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19193,12 +20981,17 @@ static PyObject *_wrap_ListCtrl_EditLabel(PyObject *self, PyObject *args, PyObje wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_EditLabel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_EditLabel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EditLabel(arg2); @@ -19219,12 +21012,17 @@ static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, Py long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_EnsureVisible",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_EnsureVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->EnsureVisible(arg2); @@ -19232,7 +21030,7 @@ static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19248,14 +21046,19 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec long result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "str",(char *) "partial", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|O:ListCtrl_FindItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ListCtrl_FindItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -19263,7 +21066,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -19274,7 +21077,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp3) delete arg3; @@ -19296,12 +21099,22 @@ static PyObject *_wrap_ListCtrl_FindItemData(PyObject *self, PyObject *args, PyO long arg3 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ListCtrl_FindItemData",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_FindItemData",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->FindItem(arg2,arg3); @@ -19309,7 +21122,7 @@ static PyObject *_wrap_ListCtrl_FindItemData(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19325,17 +21138,27 @@ static PyObject *_wrap_ListCtrl_FindItemAtPos(PyObject *self, PyObject *args, Py long result; wxPoint temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "pt",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlOi:ListCtrl_FindItemAtPos",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_FindItemAtPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->FindItem(arg2,(wxPoint const &)*arg3,arg4); @@ -19343,7 +21166,7 @@ static PyObject *_wrap_ListCtrl_FindItemAtPos(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19378,7 +21201,7 @@ static PyObject *_wrap_ListCtrl_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -19413,7 +21236,7 @@ static PyObject *_wrap_ListCtrl_InsertItem(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19428,13 +21251,18 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args, long result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_InsertStringItem",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertStringItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -19447,7 +21275,7 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp3) delete arg3; @@ -19469,12 +21297,22 @@ static PyObject *_wrap_ListCtrl_InsertImageItem(PyObject *self, PyObject *args, int arg3 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "imageIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oli:ListCtrl_InsertImageItem",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertImageItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->InsertItem(arg2,arg3); @@ -19482,7 +21320,7 @@ static PyObject *_wrap_ListCtrl_InsertImageItem(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19498,18 +21336,28 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject * long result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "label",(char *) "imageIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlOi:ListCtrl_InsertImageStringItem",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_InsertImageStringItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; temp3 = True; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->InsertItem(arg2,(wxString const &)*arg3,arg4); @@ -19517,7 +21365,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp3) delete arg3; @@ -19539,13 +21387,18 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *self, PyObject *args, wxListItem *arg3 = 0 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -19557,7 +21410,7 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19574,18 +21427,37 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO long result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "heading",(char *) "format",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|ii:ListCtrl_InsertColumn",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:ListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->InsertColumn(arg2,(wxString const &)*arg3,arg4,arg5); @@ -19593,7 +21465,7 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp3) delete arg3; @@ -19613,12 +21485,17 @@ static PyObject *_wrap_ListCtrl_SetItemCount(PyObject *self, PyObject *args, PyO wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "count", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_SetItemCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_SetItemCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetItemCount(arg2); @@ -19640,12 +21517,22 @@ static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObj int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ListCtrl_ScrollList",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_ScrollList",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollList(arg2,arg3); @@ -19653,7 +21540,7 @@ static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19667,13 +21554,18 @@ static PyObject *_wrap_ListCtrl_SetItemTextColour(PyObject *self, PyObject *args wxColour *arg3 = 0 ; wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_SetItemTextColour",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; @@ -19698,12 +21590,17 @@ static PyObject *_wrap_ListCtrl_GetItemTextColour(PyObject *self, PyObject *args long arg2 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemTextColour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyListCtrl const *)arg1)->GetItemTextColour(arg2); @@ -19729,13 +21626,18 @@ static PyObject *_wrap_ListCtrl_SetItemBackgroundColour(PyObject *self, PyObject wxColour *arg3 = 0 ; wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_SetItemBackgroundColour",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; @@ -19760,12 +21662,17 @@ static PyObject *_wrap_ListCtrl_GetItemBackgroundColour(PyObject *self, PyObject long arg2 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemBackgroundColour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyListCtrl const *)arg1)->GetItemBackgroundColour(arg2); @@ -19805,7 +21712,7 @@ static PyObject *_wrap_ListCtrl_SortItems(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19864,16 +21771,24 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_ListView",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_ListView",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -19886,6 +21801,12 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -19963,17 +21884,25 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:ListView_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:ListView_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -19986,6 +21915,12 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -20006,7 +21941,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -20027,16 +21962,21 @@ static PyObject *_wrap_ListView_Select(PyObject *self, PyObject *args, PyObject long arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "on", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|O:ListView_Select",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListView_Select",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -20059,12 +21999,17 @@ static PyObject *_wrap_ListView_Focus(PyObject *self, PyObject *args, PyObject * wxListView *arg1 = (wxListView *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListView_Focus",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_Focus",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Focus(arg2); @@ -20097,7 +22042,7 @@ static PyObject *_wrap_ListView_GetFocusedItem(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -20110,12 +22055,17 @@ static PyObject *_wrap_ListView_GetNextSelected(PyObject *self, PyObject *args, long arg2 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListView_GetNextSelected",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_GetNextSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxListView const *)arg1)->GetNextSelected(arg2); @@ -20123,7 +22073,7 @@ static PyObject *_wrap_ListView_GetNextSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -20148,7 +22098,7 @@ static PyObject *_wrap_ListView_GetFirstSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -20161,12 +22111,17 @@ static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObj long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListView_IsSelected",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_IsSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsSelected(arg2); @@ -20174,7 +22129,7 @@ static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20187,12 +22142,22 @@ static PyObject *_wrap_ListView_SetColumnImage(PyObject *self, PyObject *args, P int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ListView_SetColumnImage",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListView_SetColumnImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumnImage(arg2,arg3); @@ -20212,12 +22177,17 @@ static PyObject *_wrap_ListView_ClearColumnImage(PyObject *self, PyObject *args, wxListView *arg1 = (wxListView *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListView_ClearColumnImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_ClearColumnImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearColumnImage(arg2); @@ -20239,7 +22209,7 @@ static PyObject * ListView_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TreeCtrlNameStr_set(PyObject *_val) { +static int _wrap_TreeCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TreeCtrlNameStr is read-only."); return 1; } @@ -20323,7 +22293,7 @@ static PyObject *_wrap_TreeItemId_IsOk(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20351,7 +22321,7 @@ static PyObject *_wrap_TreeItemId___eq__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20379,7 +22349,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20608,11 +22578,25 @@ static PyObject *_wrap_new_TreeEvent(PyObject *self, PyObject *args, PyObject *k wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxTreeEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_TreeEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TreeEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTreeEvent *)new wxTreeEvent(arg1,arg2); @@ -20851,7 +22835,7 @@ static PyObject *_wrap_TreeEvent_GetKeyCode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20980,7 +22964,7 @@ static PyObject *_wrap_TreeEvent_IsEditCancelled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21000,7 +22984,7 @@ static PyObject *_wrap_TreeEvent_SetEditCanceled(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeEvent_SetEditCanceled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -21082,16 +23066,24 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_TreeCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -21100,8 +23092,14 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw } if (obj3) { { - arg4 = &temp4; - if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; } } if (obj5) { @@ -21185,17 +23183,25 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:TreeCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:TreeCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -21208,6 +23214,12 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -21228,7 +23240,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -21291,7 +23303,7 @@ static PyObject *_wrap_TreeCtrl_GetCount(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -21316,7 +23328,7 @@ static PyObject *_wrap_TreeCtrl_GetIndent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -21336,7 +23348,7 @@ static PyObject *_wrap_TreeCtrl_SetIndent(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SetIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -21371,7 +23383,7 @@ static PyObject *_wrap_TreeCtrl_GetSpacing(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -21391,7 +23403,7 @@ static PyObject *_wrap_TreeCtrl_SetSpacing(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SetSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -21615,16 +23627,23 @@ static PyObject *_wrap_TreeCtrl_GetItemImage(PyObject *self, PyObject *args, PyO int result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:TreeCtrl_GetItemImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeCtrl_GetItemImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (wxTreeItemIcon) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyTreeCtrl const *)arg1)->GetItemImage((wxTreeItemId const &)*arg2,(wxTreeItemIcon )arg3); @@ -21632,7 +23651,7 @@ static PyObject *_wrap_TreeCtrl_GetItemImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21860,16 +23879,28 @@ static PyObject *_wrap_TreeCtrl_SetItemImage(PyObject *self, PyObject *args, PyO int arg4 = (int) wxTreeItemIcon_Normal ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "image",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|i:TreeCtrl_SetItemImage",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:TreeCtrl_SetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (wxTreeItemIcon) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetItemImage((wxTreeItemId const &)*arg2,arg3,(wxTreeItemIcon )arg4); @@ -21970,7 +24001,7 @@ static PyObject *_wrap_TreeCtrl_SetItemHasChildren(PyObject *self, PyObject *arg } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22008,7 +24039,7 @@ static PyObject *_wrap_TreeCtrl_SetItemBold(PyObject *self, PyObject *args, PyOb } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22160,7 +24191,7 @@ static PyObject *_wrap_TreeCtrl_IsVisible(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22191,7 +24222,7 @@ static PyObject *_wrap_TreeCtrl_ItemHasChildren(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22222,7 +24253,7 @@ static PyObject *_wrap_TreeCtrl_IsExpanded(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22253,7 +24284,7 @@ static PyObject *_wrap_TreeCtrl_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22284,7 +24315,7 @@ static PyObject *_wrap_TreeCtrl_IsBold(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22312,7 +24343,7 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args, } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22323,7 +24354,7 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22728,18 +24759,32 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *self, PyObject *args, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiO:TreeCtrl_AddRoot",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:TreeCtrl_AddRoot",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -22782,12 +24827,14 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiO:TreeCtrl_PrependItem",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:TreeCtrl_PrependItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -22798,6 +24845,18 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyOb if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -22842,12 +24901,14 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObj PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "idPrevious",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iiO:TreeCtrl_InsertItem",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:TreeCtrl_InsertItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -22862,6 +24923,18 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObj if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -22906,19 +24979,21 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args, PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "index",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iiO:TreeCtrl_InsertItemBefore",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:TreeCtrl_InsertItemBefore",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -22926,6 +25001,18 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args, if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -22968,12 +25055,14 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObj PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiO:TreeCtrl_AppendItem",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:TreeCtrl_AppendItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -22984,6 +25073,18 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObj if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -23506,7 +25607,7 @@ static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args, } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -23531,7 +25632,7 @@ static PyObject * TreeCtrl_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_DirDialogDefaultFolderStr_set(PyObject *_val) { +static int _wrap_DirDialogDefaultFolderStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DirDialogDefaultFolderStr is read-only."); return 1; } @@ -23574,17 +25675,26 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje bool temp7 = False ; bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "dir",(char *) "pos",(char *) "size",(char *) "style",(char *) "filter",(char *) "defaultFilter",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOOlOiO:new_GenericDirCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&arg8,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOOO:new_GenericDirCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -23604,6 +25714,12 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -23611,6 +25727,12 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje temp7 = True; } } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj8) { { arg9 = wxString_in_helper(obj8); @@ -23703,18 +25825,27 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO bool temp10 = 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 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "dir",(char *) "pos",(char *) "size",(char *) "style",(char *) "filter",(char *) "defaultFilter",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOOlOiO:GenericDirCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&arg9,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOOOO:GenericDirCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -23734,6 +25865,12 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -23741,6 +25878,12 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO temp8 = True; } } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { { arg10 = wxString_in_helper(obj9); @@ -23755,7 +25898,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -23812,7 +25955,7 @@ static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -24013,7 +26156,7 @@ static PyObject *_wrap_GenericDirCtrl_ShowHidden(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GenericDirCtrl_ShowHidden",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -24048,7 +26191,7 @@ static PyObject *_wrap_GenericDirCtrl_GetShowHidden(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24144,7 +26287,7 @@ static PyObject *_wrap_GenericDirCtrl_GetFilterIndex(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24156,12 +26299,17 @@ static PyObject *_wrap_GenericDirCtrl_SetFilterIndex(PyObject *self, PyObject *a wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GenericDirCtrl_SetFilterIndex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GenericDirCtrl_SetFilterIndex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFilterIndex(arg2); @@ -24382,14 +26530,22 @@ static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyO wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_DirFilterListCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_DirFilterListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -24402,6 +26558,12 @@ static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDirFilterListCtrl *)new wxDirFilterListCtrl(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -24453,15 +26615,23 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, wxSize temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOl:DirFilterListCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:DirFilterListCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDirFilterListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -24474,6 +26644,12 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6); @@ -24481,7 +26657,7 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24496,17 +26672,22 @@ static PyObject *_wrap_DirFilterListCtrl_FillFilterList(PyObject *self, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "filter",(char *) "defaultFilter", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:DirFilterListCtrl_FillFilterList",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DirFilterListCtrl_FillFilterList",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDirFilterListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FillFilterList((wxString const &)*arg2,arg3); @@ -24554,16 +26735,22 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlOO:new_PyControl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:new_PyControl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -24576,6 +26763,12 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -24649,12 +26842,32 @@ static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *self, PyObject *arg int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyControl_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyControl_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -24678,12 +26891,39 @@ static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *self, PyObject *args, int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyControl_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyControl_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -24704,12 +26944,22 @@ static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *self, PyObject * int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyControl_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -24730,12 +26980,22 @@ static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *self, PyObject int arg2 ; int 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 *)"Oii:PyControl_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -24964,7 +27224,7 @@ static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24989,7 +27249,7 @@ static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25014,7 +27274,7 @@ static PyObject *_wrap_PyControl_base_Validate(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25039,7 +27299,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25064,7 +27324,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25169,12 +27429,26 @@ static PyObject *_wrap_new_HelpEvent(PyObject *self, PyObject *args, PyObject *k wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxHelpEvent *result; wxPoint temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_HelpEvent",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_HelpEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -25426,7 +27700,7 @@ static PyObject *_wrap_new_ContextHelp(PyObject *self, PyObject *args, PyObject } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -25491,7 +27765,7 @@ static PyObject *_wrap_ContextHelp_BeginContextHelp(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25516,7 +27790,7 @@ static PyObject *_wrap_ContextHelp_EndContextHelp(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25543,14 +27817,22 @@ static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyO wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_ContextHelpButton",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_ContextHelpButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -25563,6 +27845,12 @@ static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxContextHelpButton *)new wxContextHelpButton(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -25686,7 +27974,7 @@ static PyObject *_wrap_HelpProvider_ShowHelp(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25743,13 +28031,18 @@ static PyObject *_wrap_HelpProvider_AddHelpById(PyObject *self, PyObject *args, wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:HelpProvider_AddHelpById",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HelpProvider_AddHelpById",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHelpProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25998,15 +28291,20 @@ static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject long arg2 ; wxGenericDragImage *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "listCtrl",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_DragListItem",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_DragListItem",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGenericDragImage *)new wxGenericDragImage((wxPyListCtrl const &)*arg1,arg2); @@ -26099,7 +28397,7 @@ static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -26113,7 +28411,7 @@ static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26151,7 +28449,7 @@ static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26176,7 +28474,7 @@ static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26208,7 +28506,7 @@ static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26233,7 +28531,7 @@ static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26258,7 +28556,7 @@ static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26332,7 +28630,7 @@ static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26383,7 +28681,7 @@ static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26420,11 +28718,11 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -26434,7 +28732,7 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26570,6 +28868,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS }, { (char *)"new_TextAttr", _wrap_new_TextAttr, METH_VARARGS }, + { (char *)"delete_TextAttr", (PyCFunction) _wrap_delete_TextAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_SetBackgroundColour", (PyCFunction) _wrap_TextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, @@ -28272,6 +30571,7 @@ static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p static swig_type_info _swigt__p_wxContextHelpButton[] = {{"_p_wxContextHelpButton", 0, "wxContextHelpButton *", 0},{"_p_wxContextHelpButton"},{0}}; static swig_type_info _swigt__p_wxRadioBox[] = {{"_p_wxRadioBox", 0, "wxRadioBox *", 0},{"_p_wxRadioBox"},{0}}; static swig_type_info _swigt__p_wxScrollBar[] = {{"_p_wxScrollBar", 0, "wxScrollBar *", 0},{"_p_wxScrollBar"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0},{"_p_wxTreeItemId"},{0}}; static swig_type_info _swigt__p_wxComboBox[] = {{"_p_wxComboBox", 0, "wxComboBox *", 0},{"_p_wxComboBox"},{0}}; static swig_type_info _swigt__p_wxHelpEvent[] = {{"_p_wxHelpEvent", 0, "wxHelpEvent *", 0},{"_p_wxHelpEvent"},{0}}; @@ -28357,6 +30657,7 @@ _swigt__p_wxRect, _swigt__p_wxContextHelpButton, _swigt__p_wxRadioBox, _swigt__p_wxScrollBar, +_swigt__p_char, _swigt__p_wxTreeItemId, _swigt__p_wxComboBox, _swigt__p_wxHelpEvent, @@ -28395,256 +30696,6 @@ _swigt__p_wxValidator, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"BU_LEFT", (long) wxBU_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_TOP", (long) wxBU_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_RIGHT", (long) wxBU_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_BOTTOM", (long) wxBU_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_EXACTFIT", (long) wxBU_EXACTFIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_AUTODRAW", (long) wxBU_AUTODRAW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_2STATE", (long) wxCHK_2STATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_3STATE", (long) wxCHK_3STATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_ALLOW_3RD_STATE_FOR_USER", (long) wxCHK_ALLOW_3RD_STATE_FOR_USER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_UNCHECKED", (long) wxCHK_UNCHECKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_CHECKED", (long) wxCHK_CHECKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_UNDETERMINED", (long) wxCHK_UNDETERMINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GA_HORIZONTAL", (long) wxGA_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GA_VERTICAL", (long) wxGA_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GA_SMOOTH", (long) wxGA_SMOOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GA_PROGRESSBAR", (long) wxGA_PROGRESSBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_NO_VSCROLL", (long) wxTE_NO_VSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_AUTO_SCROLL", (long) wxTE_AUTO_SCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_READONLY", (long) wxTE_READONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_MULTILINE", (long) wxTE_MULTILINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_PROCESS_TAB", (long) wxTE_PROCESS_TAB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_LEFT", (long) wxTE_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_CENTER", (long) wxTE_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_RIGHT", (long) wxTE_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_CENTRE", (long) wxTE_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_RICH", (long) wxTE_RICH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_PROCESS_ENTER", (long) wxTE_PROCESS_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_PASSWORD", (long) wxTE_PASSWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_AUTO_URL", (long) wxTE_AUTO_URL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_NOHIDESEL", (long) wxTE_NOHIDESEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_DONTWRAP", (long) wxTE_DONTWRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_LINEWRAP", (long) wxTE_LINEWRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_WORDWRAP", (long) wxTE_WORDWRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_RICH2", (long) wxTE_RICH2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_DEFAULT", (long) wxTEXT_ALIGNMENT_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_LEFT", (long) wxTEXT_ALIGNMENT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_CENTRE", (long) wxTEXT_ALIGNMENT_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_CENTER", (long) wxTEXT_ALIGNMENT_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_RIGHT", (long) wxTEXT_ALIGNMENT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_JUSTIFIED", (long) wxTEXT_ALIGNMENT_JUSTIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_TEXT_COLOUR", (long) wxTEXT_ATTR_TEXT_COLOUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_BACKGROUND_COLOUR", (long) wxTEXT_ATTR_BACKGROUND_COLOUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_FACE", (long) wxTEXT_ATTR_FONT_FACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_SIZE", (long) wxTEXT_ATTR_FONT_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_WEIGHT", (long) wxTEXT_ATTR_FONT_WEIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_ITALIC", (long) wxTEXT_ATTR_FONT_ITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_UNDERLINE", (long) wxTEXT_ATTR_FONT_UNDERLINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT", (long) wxTEXT_ATTR_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_ALIGNMENT", (long) wxTEXT_ATTR_ALIGNMENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_LEFT_INDENT", (long) wxTEXT_ATTR_LEFT_INDENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_RIGHT_INDENT", (long) wxTEXT_ATTR_RIGHT_INDENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_TABS", (long) wxTEXT_ATTR_TABS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TEXT_UPDATED", (long) wxEVT_COMMAND_TEXT_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TEXT_ENTER", (long) wxEVT_COMMAND_TEXT_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TEXT_URL", (long) wxEVT_COMMAND_TEXT_URL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TEXT_MAXLEN", (long) wxEVT_COMMAND_TEXT_MAXLEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_HORIZONTAL", (long) wxSP_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_VERTICAL", (long) wxSP_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_ARROW_KEYS", (long) wxSP_ARROW_KEYS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_WRAP", (long) wxSP_WRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPINCTRL_UPDATED", (long) wxEVT_COMMAND_SPINCTRL_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", (long) wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_FIXEDWIDTH", (long) wxNB_FIXEDWIDTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_TOP", (long) wxNB_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_LEFT", (long) wxNB_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_RIGHT", (long) wxNB_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_BOTTOM", (long) wxNB_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_MULTILINE", (long) wxNB_MULTILINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_HITTEST_NOWHERE", (long) wxNB_HITTEST_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_HITTEST_ONICON", (long) wxNB_HITTEST_ONICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_HITTEST_ONLABEL", (long) wxNB_HITTEST_ONLABEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_HITTEST_ONITEM", (long) wxNB_HITTEST_ONITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", (long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", (long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_DEFAULT", (long) wxLB_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_TOP", (long) wxLB_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_BOTTOM", (long) wxLB_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_LEFT", (long) wxLB_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_RIGHT", (long) wxLB_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_ALIGN_MASK", (long) wxLB_ALIGN_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED", (long) wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING", (long) wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_STYLE_BUTTON", (long) wxTOOL_STYLE_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_STYLE_SEPARATOR", (long) wxTOOL_STYLE_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_STYLE_CONTROL", (long) wxTOOL_STYLE_CONTROL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_HORIZONTAL", (long) wxTB_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_VERTICAL", (long) wxTB_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_3DBUTTONS", (long) wxTB_3DBUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_FLAT", (long) wxTB_FLAT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_DOCKABLE", (long) wxTB_DOCKABLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_NOICONS", (long) wxTB_NOICONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_TEXT", (long) wxTB_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_NODIVIDER", (long) wxTB_NODIVIDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_NOALIGN", (long) wxTB_NOALIGN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_HORZ_LAYOUT", (long) wxTB_HORZ_LAYOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_HORZ_TEXT", (long) wxTB_HORZ_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_VRULES", (long) wxLC_VRULES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_HRULES", (long) wxLC_HRULES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_ICON", (long) wxLC_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_SMALL_ICON", (long) wxLC_SMALL_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_LIST", (long) wxLC_LIST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_REPORT", (long) wxLC_REPORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_ALIGN_TOP", (long) wxLC_ALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_ALIGN_LEFT", (long) wxLC_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_AUTOARRANGE", (long) wxLC_AUTOARRANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_VIRTUAL", (long) wxLC_VIRTUAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_EDIT_LABELS", (long) wxLC_EDIT_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_NO_HEADER", (long) wxLC_NO_HEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_NO_SORT_HEADER", (long) wxLC_NO_SORT_HEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_SINGLE_SEL", (long) wxLC_SINGLE_SEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_SORT_ASCENDING", (long) wxLC_SORT_ASCENDING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_SORT_DESCENDING", (long) wxLC_SORT_DESCENDING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_MASK_TYPE", (long) wxLC_MASK_TYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_MASK_ALIGN", (long) wxLC_MASK_ALIGN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_MASK_SORT", (long) wxLC_MASK_SORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_STATE", (long) wxLIST_MASK_STATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_TEXT", (long) wxLIST_MASK_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_IMAGE", (long) wxLIST_MASK_IMAGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_DATA", (long) wxLIST_MASK_DATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_SET_ITEM", (long) wxLIST_SET_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_WIDTH", (long) wxLIST_MASK_WIDTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_FORMAT", (long) wxLIST_MASK_FORMAT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_DONTCARE", (long) wxLIST_STATE_DONTCARE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_DROPHILITED", (long) wxLIST_STATE_DROPHILITED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_FOCUSED", (long) wxLIST_STATE_FOCUSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_SELECTED", (long) wxLIST_STATE_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_CUT", (long) wxLIST_STATE_CUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_DISABLED", (long) wxLIST_STATE_DISABLED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_FILTERED", (long) wxLIST_STATE_FILTERED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_INUSE", (long) wxLIST_STATE_INUSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_PICKED", (long) wxLIST_STATE_PICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_SOURCE", (long) wxLIST_STATE_SOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ABOVE", (long) wxLIST_HITTEST_ABOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_BELOW", (long) wxLIST_HITTEST_BELOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_NOWHERE", (long) wxLIST_HITTEST_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEMICON", (long) wxLIST_HITTEST_ONITEMICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEMLABEL", (long) wxLIST_HITTEST_ONITEMLABEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEMRIGHT", (long) wxLIST_HITTEST_ONITEMRIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEMSTATEICON", (long) wxLIST_HITTEST_ONITEMSTATEICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_TOLEFT", (long) wxLIST_HITTEST_TOLEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_TORIGHT", (long) wxLIST_HITTEST_TORIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEM", (long) wxLIST_HITTEST_ONITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_ABOVE", (long) wxLIST_NEXT_ABOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_ALL", (long) wxLIST_NEXT_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_BELOW", (long) wxLIST_NEXT_BELOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_LEFT", (long) wxLIST_NEXT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_RIGHT", (long) wxLIST_NEXT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_ALIGN_DEFAULT", (long) wxLIST_ALIGN_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_ALIGN_LEFT", (long) wxLIST_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_ALIGN_TOP", (long) wxLIST_ALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_ALIGN_SNAP_TO_GRID", (long) wxLIST_ALIGN_SNAP_TO_GRID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FORMAT_LEFT", (long) wxLIST_FORMAT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FORMAT_RIGHT", (long) wxLIST_FORMAT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FORMAT_CENTRE", (long) wxLIST_FORMAT_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FORMAT_CENTER", (long) wxLIST_FORMAT_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_AUTOSIZE", (long) wxLIST_AUTOSIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_AUTOSIZE_USEHEADER", (long) wxLIST_AUTOSIZE_USEHEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_RECT_BOUNDS", (long) wxLIST_RECT_BOUNDS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_RECT_ICON", (long) wxLIST_RECT_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_RECT_LABEL", (long) wxLIST_RECT_LABEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FIND_UP", (long) wxLIST_FIND_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FIND_DOWN", (long) wxLIST_FIND_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FIND_LEFT", (long) wxLIST_FIND_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FIND_RIGHT", (long) wxLIST_FIND_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_BEGIN_DRAG", (long) wxEVT_COMMAND_LIST_BEGIN_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_BEGIN_RDRAG", (long) wxEVT_COMMAND_LIST_BEGIN_RDRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT", (long) wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_END_LABEL_EDIT", (long) wxEVT_COMMAND_LIST_END_LABEL_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_DELETE_ITEM", (long) wxEVT_COMMAND_LIST_DELETE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS", (long) wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_GET_INFO", (long) wxEVT_COMMAND_LIST_GET_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_SET_INFO", (long) wxEVT_COMMAND_LIST_SET_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_SELECTED", (long) wxEVT_COMMAND_LIST_ITEM_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_DESELECTED", (long) wxEVT_COMMAND_LIST_ITEM_DESELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_KEY_DOWN", (long) wxEVT_COMMAND_LIST_KEY_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_INSERT_ITEM", (long) wxEVT_COMMAND_LIST_INSERT_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_CLICK", (long) wxEVT_COMMAND_LIST_COL_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK", (long) wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK", (long) wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_ACTIVATED", (long) wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_CACHE_HINT", (long) wxEVT_COMMAND_LIST_CACHE_HINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_RIGHT_CLICK", (long) wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_BEGIN_DRAG", (long) wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_DRAGGING", (long) wxEVT_COMMAND_LIST_COL_DRAGGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_END_DRAG", (long) wxEVT_COMMAND_LIST_COL_END_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_FOCUSED", (long) wxEVT_COMMAND_LIST_ITEM_FOCUSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_NO_BUTTONS", (long) wxTR_NO_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_HAS_BUTTONS", (long) wxTR_HAS_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_NO_LINES", (long) wxTR_NO_LINES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_LINES_AT_ROOT", (long) wxTR_LINES_AT_ROOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_SINGLE", (long) wxTR_SINGLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_MULTIPLE", (long) wxTR_MULTIPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_EXTENDED", (long) wxTR_EXTENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_HAS_VARIABLE_ROW_HEIGHT", (long) wxTR_HAS_VARIABLE_ROW_HEIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_EDIT_LABELS", (long) wxTR_EDIT_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_HIDE_ROOT", (long) wxTR_HIDE_ROOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_ROW_LINES", (long) wxTR_ROW_LINES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_FULL_ROW_HIGHLIGHT", (long) wxTR_FULL_ROW_HIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_DEFAULT_STYLE", (long) wxTR_DEFAULT_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_TWIST_BUTTONS", (long) wxTR_TWIST_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_MAC_BUTTONS", (long) wxTR_MAC_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_AQUA_BUTTONS", (long) wxTR_AQUA_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_Normal", (long) wxTreeItemIcon_Normal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_Selected", (long) wxTreeItemIcon_Selected, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_Expanded", (long) wxTreeItemIcon_Expanded, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_SelectedExpanded", (long) wxTreeItemIcon_SelectedExpanded, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_Max", (long) wxTreeItemIcon_Max, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ABOVE", (long) wxTREE_HITTEST_ABOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_BELOW", (long) wxTREE_HITTEST_BELOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_NOWHERE", (long) wxTREE_HITTEST_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMBUTTON", (long) wxTREE_HITTEST_ONITEMBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMICON", (long) wxTREE_HITTEST_ONITEMICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMINDENT", (long) wxTREE_HITTEST_ONITEMINDENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMLABEL", (long) wxTREE_HITTEST_ONITEMLABEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMRIGHT", (long) wxTREE_HITTEST_ONITEMRIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMSTATEICON", (long) wxTREE_HITTEST_ONITEMSTATEICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_TOLEFT", (long) wxTREE_HITTEST_TOLEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_TORIGHT", (long) wxTREE_HITTEST_TORIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMUPPERPART", (long) wxTREE_HITTEST_ONITEMUPPERPART, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMLOWERPART", (long) wxTREE_HITTEST_ONITEMLOWERPART, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEM", (long) wxTREE_HITTEST_ONITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_BEGIN_DRAG", (long) wxEVT_COMMAND_TREE_BEGIN_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_BEGIN_RDRAG", (long) wxEVT_COMMAND_TREE_BEGIN_RDRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT", (long) wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_END_LABEL_EDIT", (long) wxEVT_COMMAND_TREE_END_LABEL_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_DELETE_ITEM", (long) wxEVT_COMMAND_TREE_DELETE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_GET_INFO", (long) wxEVT_COMMAND_TREE_GET_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_SET_INFO", (long) wxEVT_COMMAND_TREE_SET_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_EXPANDED", (long) wxEVT_COMMAND_TREE_ITEM_EXPANDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_EXPANDING", (long) wxEVT_COMMAND_TREE_ITEM_EXPANDING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_COLLAPSED", (long) wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_COLLAPSING", (long) wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_SEL_CHANGED", (long) wxEVT_COMMAND_TREE_SEL_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_SEL_CHANGING", (long) wxEVT_COMMAND_TREE_SEL_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_KEY_DOWN", (long) wxEVT_COMMAND_TREE_KEY_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_ACTIVATED", (long) wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK", (long) wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK", (long) wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_END_DRAG", (long) wxEVT_COMMAND_TREE_END_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK", (long) wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP", (long) wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_DIR_ONLY", (long) wxDIRCTRL_DIR_ONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_SELECT_FIRST", (long) wxDIRCTRL_SELECT_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_SHOW_FILTERS", (long) wxDIRCTRL_SHOW_FILTERS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_3D_INTERNAL", (long) wxDIRCTRL_3D_INTERNAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_EDIT_LABELS", (long) wxDIRCTRL_EDIT_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_EX_CONTEXTHELP", (long) wxFRAME_EX_CONTEXTHELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_EX_CONTEXTHELP", (long) wxDIALOG_EX_CONTEXTHELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_HELP", (long) wxEVT_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DETAILED_HELP", (long) wxEVT_DETAILED_HELP, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -28673,15 +30724,67 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"ButtonNameStr",_wrap_ButtonNameStr_get, _wrap_ButtonNameStr_set); + PyDict_SetItemString(d,"BU_LEFT", SWIG_PyObj_FromInt((int)wxBU_LEFT)); + PyDict_SetItemString(d,"BU_TOP", SWIG_PyObj_FromInt((int)wxBU_TOP)); + PyDict_SetItemString(d,"BU_RIGHT", SWIG_PyObj_FromInt((int)wxBU_RIGHT)); + PyDict_SetItemString(d,"BU_BOTTOM", SWIG_PyObj_FromInt((int)wxBU_BOTTOM)); + PyDict_SetItemString(d,"BU_EXACTFIT", SWIG_PyObj_FromInt((int)wxBU_EXACTFIT)); + PyDict_SetItemString(d,"BU_AUTODRAW", SWIG_PyObj_FromInt((int)wxBU_AUTODRAW)); SWIG_addvarlink(SWIG_globals,(char*)"CheckBoxNameStr",_wrap_CheckBoxNameStr_get, _wrap_CheckBoxNameStr_set); + PyDict_SetItemString(d,"CHK_2STATE", SWIG_PyObj_FromInt((int)wxCHK_2STATE)); + PyDict_SetItemString(d,"CHK_3STATE", SWIG_PyObj_FromInt((int)wxCHK_3STATE)); + PyDict_SetItemString(d,"CHK_ALLOW_3RD_STATE_FOR_USER", SWIG_PyObj_FromInt((int)wxCHK_ALLOW_3RD_STATE_FOR_USER)); + PyDict_SetItemString(d,"CHK_UNCHECKED", SWIG_PyObj_FromInt((int)wxCHK_UNCHECKED)); + PyDict_SetItemString(d,"CHK_CHECKED", SWIG_PyObj_FromInt((int)wxCHK_CHECKED)); + PyDict_SetItemString(d,"CHK_UNDETERMINED", SWIG_PyObj_FromInt((int)wxCHK_UNDETERMINED)); SWIG_addvarlink(SWIG_globals,(char*)"ChoiceNameStr",_wrap_ChoiceNameStr_get, _wrap_ChoiceNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"ComboBoxNameStr",_wrap_ComboBoxNameStr_get, _wrap_ComboBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"GaugeNameStr",_wrap_GaugeNameStr_get, _wrap_GaugeNameStr_set); + PyDict_SetItemString(d,"GA_HORIZONTAL", SWIG_PyObj_FromInt((int)wxGA_HORIZONTAL)); + PyDict_SetItemString(d,"GA_VERTICAL", SWIG_PyObj_FromInt((int)wxGA_VERTICAL)); + PyDict_SetItemString(d,"GA_SMOOTH", SWIG_PyObj_FromInt((int)wxGA_SMOOTH)); + PyDict_SetItemString(d,"GA_PROGRESSBAR", SWIG_PyObj_FromInt((int)wxGA_PROGRESSBAR)); SWIG_addvarlink(SWIG_globals,(char*)"StaticBitmapNameStr",_wrap_StaticBitmapNameStr_get, _wrap_StaticBitmapNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"StaticBoxNameStr",_wrap_StaticBoxNameStr_get, _wrap_StaticBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"StaticTextNameStr",_wrap_StaticTextNameStr_get, _wrap_StaticTextNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"ListBoxNameStr",_wrap_ListBoxNameStr_get, _wrap_ListBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"TextCtrlNameStr",_wrap_TextCtrlNameStr_get, _wrap_TextCtrlNameStr_set); + PyDict_SetItemString(d,"TE_NO_VSCROLL", SWIG_PyObj_FromInt((int)wxTE_NO_VSCROLL)); + PyDict_SetItemString(d,"TE_AUTO_SCROLL", SWIG_PyObj_FromInt((int)wxTE_AUTO_SCROLL)); + PyDict_SetItemString(d,"TE_READONLY", SWIG_PyObj_FromInt((int)wxTE_READONLY)); + PyDict_SetItemString(d,"TE_MULTILINE", SWIG_PyObj_FromInt((int)wxTE_MULTILINE)); + PyDict_SetItemString(d,"TE_PROCESS_TAB", SWIG_PyObj_FromInt((int)wxTE_PROCESS_TAB)); + PyDict_SetItemString(d,"TE_LEFT", SWIG_PyObj_FromInt((int)wxTE_LEFT)); + PyDict_SetItemString(d,"TE_CENTER", SWIG_PyObj_FromInt((int)wxTE_CENTER)); + PyDict_SetItemString(d,"TE_RIGHT", SWIG_PyObj_FromInt((int)wxTE_RIGHT)); + PyDict_SetItemString(d,"TE_CENTRE", SWIG_PyObj_FromInt((int)wxTE_CENTRE)); + PyDict_SetItemString(d,"TE_RICH", SWIG_PyObj_FromInt((int)wxTE_RICH)); + PyDict_SetItemString(d,"TE_PROCESS_ENTER", SWIG_PyObj_FromInt((int)wxTE_PROCESS_ENTER)); + PyDict_SetItemString(d,"TE_PASSWORD", SWIG_PyObj_FromInt((int)wxTE_PASSWORD)); + PyDict_SetItemString(d,"TE_AUTO_URL", SWIG_PyObj_FromInt((int)wxTE_AUTO_URL)); + PyDict_SetItemString(d,"TE_NOHIDESEL", SWIG_PyObj_FromInt((int)wxTE_NOHIDESEL)); + PyDict_SetItemString(d,"TE_DONTWRAP", SWIG_PyObj_FromInt((int)wxTE_DONTWRAP)); + PyDict_SetItemString(d,"TE_LINEWRAP", SWIG_PyObj_FromInt((int)wxTE_LINEWRAP)); + PyDict_SetItemString(d,"TE_WORDWRAP", SWIG_PyObj_FromInt((int)wxTE_WORDWRAP)); + PyDict_SetItemString(d,"TE_RICH2", SWIG_PyObj_FromInt((int)wxTE_RICH2)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_DEFAULT)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_LEFT", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_LEFT)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_CENTRE", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_CENTRE)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_CENTER", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_CENTER)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_RIGHT", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_RIGHT)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_JUSTIFIED", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_JUSTIFIED)); + PyDict_SetItemString(d,"TEXT_ATTR_TEXT_COLOUR", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_TEXT_COLOUR)); + PyDict_SetItemString(d,"TEXT_ATTR_BACKGROUND_COLOUR", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_BACKGROUND_COLOUR)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_FACE", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_FACE)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_SIZE", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_SIZE)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_WEIGHT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_WEIGHT)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_ITALIC", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_ITALIC)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_UNDERLINE", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_UNDERLINE)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT)); + PyDict_SetItemString(d,"TEXT_ATTR_ALIGNMENT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_ALIGNMENT)); + PyDict_SetItemString(d,"TEXT_ATTR_LEFT_INDENT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_LEFT_INDENT)); + PyDict_SetItemString(d,"TEXT_ATTR_RIGHT_INDENT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_RIGHT_INDENT)); + PyDict_SetItemString(d,"TEXT_ATTR_TABS", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_TABS)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_UPDATED", PyInt_FromLong(wxEVT_COMMAND_TEXT_UPDATED)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_ENTER", PyInt_FromLong(wxEVT_COMMAND_TEXT_ENTER)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_URL", PyInt_FromLong(wxEVT_COMMAND_TEXT_URL)); @@ -28689,6 +30792,10 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ScrollBarNameStr",_wrap_ScrollBarNameStr_get, _wrap_ScrollBarNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"SPIN_BUTTON_NAME",_wrap_SPIN_BUTTON_NAME_get, _wrap_SPIN_BUTTON_NAME_set); SWIG_addvarlink(SWIG_globals,(char*)"SpinCtrlNameStr",_wrap_SpinCtrlNameStr_get, _wrap_SpinCtrlNameStr_set); + PyDict_SetItemString(d,"SP_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSP_HORIZONTAL)); + PyDict_SetItemString(d,"SP_VERTICAL", SWIG_PyObj_FromInt((int)wxSP_VERTICAL)); + PyDict_SetItemString(d,"SP_ARROW_KEYS", SWIG_PyObj_FromInt((int)wxSP_ARROW_KEYS)); + PyDict_SetItemString(d,"SP_WRAP", SWIG_PyObj_FromInt((int)wxSP_WRAP)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPINCTRL_UPDATED", PyInt_FromLong(wxEVT_COMMAND_SPINCTRL_UPDATED)); SWIG_addvarlink(SWIG_globals,(char*)"RadioBoxNameStr",_wrap_RadioBoxNameStr_get, _wrap_RadioBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"RadioButtonNameStr",_wrap_RadioButtonNameStr_get, _wrap_RadioButtonNameStr_set); @@ -28696,11 +30803,109 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ToggleButtonNameStr",_wrap_ToggleButtonNameStr_get, _wrap_ToggleButtonNameStr_set); PyDict_SetItemString(d, "wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)); SWIG_addvarlink(SWIG_globals,(char*)"NOTEBOOK_NAME",_wrap_NOTEBOOK_NAME_get, _wrap_NOTEBOOK_NAME_set); + PyDict_SetItemString(d,"NB_FIXEDWIDTH", SWIG_PyObj_FromInt((int)wxNB_FIXEDWIDTH)); + PyDict_SetItemString(d,"NB_TOP", SWIG_PyObj_FromInt((int)wxNB_TOP)); + PyDict_SetItemString(d,"NB_LEFT", SWIG_PyObj_FromInt((int)wxNB_LEFT)); + PyDict_SetItemString(d,"NB_RIGHT", SWIG_PyObj_FromInt((int)wxNB_RIGHT)); + PyDict_SetItemString(d,"NB_BOTTOM", SWIG_PyObj_FromInt((int)wxNB_BOTTOM)); + PyDict_SetItemString(d,"NB_MULTILINE", SWIG_PyObj_FromInt((int)wxNB_MULTILINE)); + PyDict_SetItemString(d,"NB_HITTEST_NOWHERE", SWIG_PyObj_FromInt((int)wxNB_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"NB_HITTEST_ONICON", SWIG_PyObj_FromInt((int)wxNB_HITTEST_ONICON)); + PyDict_SetItemString(d,"NB_HITTEST_ONLABEL", SWIG_PyObj_FromInt((int)wxNB_HITTEST_ONLABEL)); + PyDict_SetItemString(d,"NB_HITTEST_ONITEM", SWIG_PyObj_FromInt((int)wxNB_HITTEST_ONITEM)); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d,"LB_DEFAULT", SWIG_PyObj_FromInt((int)wxLB_DEFAULT)); + PyDict_SetItemString(d,"LB_TOP", SWIG_PyObj_FromInt((int)wxLB_TOP)); + PyDict_SetItemString(d,"LB_BOTTOM", SWIG_PyObj_FromInt((int)wxLB_BOTTOM)); + PyDict_SetItemString(d,"LB_LEFT", SWIG_PyObj_FromInt((int)wxLB_LEFT)); + PyDict_SetItemString(d,"LB_RIGHT", SWIG_PyObj_FromInt((int)wxLB_RIGHT)); + PyDict_SetItemString(d,"LB_ALIGN_MASK", SWIG_PyObj_FromInt((int)wxLB_ALIGN_MASK)); PyDict_SetItemString(d, "wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d,"TOOL_STYLE_BUTTON", SWIG_PyObj_FromInt((int)wxTOOL_STYLE_BUTTON)); + PyDict_SetItemString(d,"TOOL_STYLE_SEPARATOR", SWIG_PyObj_FromInt((int)wxTOOL_STYLE_SEPARATOR)); + PyDict_SetItemString(d,"TOOL_STYLE_CONTROL", SWIG_PyObj_FromInt((int)wxTOOL_STYLE_CONTROL)); + PyDict_SetItemString(d,"TB_HORIZONTAL", SWIG_PyObj_FromInt((int)wxTB_HORIZONTAL)); + PyDict_SetItemString(d,"TB_VERTICAL", SWIG_PyObj_FromInt((int)wxTB_VERTICAL)); + PyDict_SetItemString(d,"TB_3DBUTTONS", SWIG_PyObj_FromInt((int)wxTB_3DBUTTONS)); + PyDict_SetItemString(d,"TB_FLAT", SWIG_PyObj_FromInt((int)wxTB_FLAT)); + PyDict_SetItemString(d,"TB_DOCKABLE", SWIG_PyObj_FromInt((int)wxTB_DOCKABLE)); + PyDict_SetItemString(d,"TB_NOICONS", SWIG_PyObj_FromInt((int)wxTB_NOICONS)); + PyDict_SetItemString(d,"TB_TEXT", SWIG_PyObj_FromInt((int)wxTB_TEXT)); + PyDict_SetItemString(d,"TB_NODIVIDER", SWIG_PyObj_FromInt((int)wxTB_NODIVIDER)); + PyDict_SetItemString(d,"TB_NOALIGN", SWIG_PyObj_FromInt((int)wxTB_NOALIGN)); + PyDict_SetItemString(d,"TB_HORZ_LAYOUT", SWIG_PyObj_FromInt((int)wxTB_HORZ_LAYOUT)); + PyDict_SetItemString(d,"TB_HORZ_TEXT", SWIG_PyObj_FromInt((int)wxTB_HORZ_TEXT)); SWIG_addvarlink(SWIG_globals,(char*)"ListCtrlNameStr",_wrap_ListCtrlNameStr_get, _wrap_ListCtrlNameStr_set); + PyDict_SetItemString(d,"LC_VRULES", SWIG_PyObj_FromInt((int)wxLC_VRULES)); + PyDict_SetItemString(d,"LC_HRULES", SWIG_PyObj_FromInt((int)wxLC_HRULES)); + PyDict_SetItemString(d,"LC_ICON", SWIG_PyObj_FromInt((int)wxLC_ICON)); + PyDict_SetItemString(d,"LC_SMALL_ICON", SWIG_PyObj_FromInt((int)wxLC_SMALL_ICON)); + PyDict_SetItemString(d,"LC_LIST", SWIG_PyObj_FromInt((int)wxLC_LIST)); + PyDict_SetItemString(d,"LC_REPORT", SWIG_PyObj_FromInt((int)wxLC_REPORT)); + PyDict_SetItemString(d,"LC_ALIGN_TOP", SWIG_PyObj_FromInt((int)wxLC_ALIGN_TOP)); + PyDict_SetItemString(d,"LC_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxLC_ALIGN_LEFT)); + PyDict_SetItemString(d,"LC_AUTOARRANGE", SWIG_PyObj_FromInt((int)wxLC_AUTOARRANGE)); + PyDict_SetItemString(d,"LC_VIRTUAL", SWIG_PyObj_FromInt((int)wxLC_VIRTUAL)); + PyDict_SetItemString(d,"LC_EDIT_LABELS", SWIG_PyObj_FromInt((int)wxLC_EDIT_LABELS)); + PyDict_SetItemString(d,"LC_NO_HEADER", SWIG_PyObj_FromInt((int)wxLC_NO_HEADER)); + PyDict_SetItemString(d,"LC_NO_SORT_HEADER", SWIG_PyObj_FromInt((int)wxLC_NO_SORT_HEADER)); + PyDict_SetItemString(d,"LC_SINGLE_SEL", SWIG_PyObj_FromInt((int)wxLC_SINGLE_SEL)); + PyDict_SetItemString(d,"LC_SORT_ASCENDING", SWIG_PyObj_FromInt((int)wxLC_SORT_ASCENDING)); + PyDict_SetItemString(d,"LC_SORT_DESCENDING", SWIG_PyObj_FromInt((int)wxLC_SORT_DESCENDING)); + PyDict_SetItemString(d,"LC_MASK_TYPE", SWIG_PyObj_FromInt((int)wxLC_MASK_TYPE)); + PyDict_SetItemString(d,"LC_MASK_ALIGN", SWIG_PyObj_FromInt((int)wxLC_MASK_ALIGN)); + PyDict_SetItemString(d,"LC_MASK_SORT", SWIG_PyObj_FromInt((int)wxLC_MASK_SORT)); + PyDict_SetItemString(d,"LIST_MASK_STATE", SWIG_PyObj_FromInt((int)wxLIST_MASK_STATE)); + PyDict_SetItemString(d,"LIST_MASK_TEXT", SWIG_PyObj_FromInt((int)wxLIST_MASK_TEXT)); + PyDict_SetItemString(d,"LIST_MASK_IMAGE", SWIG_PyObj_FromInt((int)wxLIST_MASK_IMAGE)); + PyDict_SetItemString(d,"LIST_MASK_DATA", SWIG_PyObj_FromInt((int)wxLIST_MASK_DATA)); + PyDict_SetItemString(d,"LIST_SET_ITEM", SWIG_PyObj_FromInt((int)wxLIST_SET_ITEM)); + PyDict_SetItemString(d,"LIST_MASK_WIDTH", SWIG_PyObj_FromInt((int)wxLIST_MASK_WIDTH)); + PyDict_SetItemString(d,"LIST_MASK_FORMAT", SWIG_PyObj_FromInt((int)wxLIST_MASK_FORMAT)); + PyDict_SetItemString(d,"LIST_STATE_DONTCARE", SWIG_PyObj_FromInt((int)wxLIST_STATE_DONTCARE)); + PyDict_SetItemString(d,"LIST_STATE_DROPHILITED", SWIG_PyObj_FromInt((int)wxLIST_STATE_DROPHILITED)); + PyDict_SetItemString(d,"LIST_STATE_FOCUSED", SWIG_PyObj_FromInt((int)wxLIST_STATE_FOCUSED)); + PyDict_SetItemString(d,"LIST_STATE_SELECTED", SWIG_PyObj_FromInt((int)wxLIST_STATE_SELECTED)); + PyDict_SetItemString(d,"LIST_STATE_CUT", SWIG_PyObj_FromInt((int)wxLIST_STATE_CUT)); + PyDict_SetItemString(d,"LIST_STATE_DISABLED", SWIG_PyObj_FromInt((int)wxLIST_STATE_DISABLED)); + PyDict_SetItemString(d,"LIST_STATE_FILTERED", SWIG_PyObj_FromInt((int)wxLIST_STATE_FILTERED)); + PyDict_SetItemString(d,"LIST_STATE_INUSE", SWIG_PyObj_FromInt((int)wxLIST_STATE_INUSE)); + PyDict_SetItemString(d,"LIST_STATE_PICKED", SWIG_PyObj_FromInt((int)wxLIST_STATE_PICKED)); + PyDict_SetItemString(d,"LIST_STATE_SOURCE", SWIG_PyObj_FromInt((int)wxLIST_STATE_SOURCE)); + PyDict_SetItemString(d,"LIST_HITTEST_ABOVE", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ABOVE)); + PyDict_SetItemString(d,"LIST_HITTEST_BELOW", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_BELOW)); + PyDict_SetItemString(d,"LIST_HITTEST_NOWHERE", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEMICON", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEMICON)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEMLABEL", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEMLABEL)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEMRIGHT", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEMRIGHT)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEMSTATEICON", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEMSTATEICON)); + PyDict_SetItemString(d,"LIST_HITTEST_TOLEFT", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_TOLEFT)); + PyDict_SetItemString(d,"LIST_HITTEST_TORIGHT", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_TORIGHT)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEM", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEM)); + PyDict_SetItemString(d,"LIST_NEXT_ABOVE", SWIG_PyObj_FromInt((int)wxLIST_NEXT_ABOVE)); + PyDict_SetItemString(d,"LIST_NEXT_ALL", SWIG_PyObj_FromInt((int)wxLIST_NEXT_ALL)); + PyDict_SetItemString(d,"LIST_NEXT_BELOW", SWIG_PyObj_FromInt((int)wxLIST_NEXT_BELOW)); + PyDict_SetItemString(d,"LIST_NEXT_LEFT", SWIG_PyObj_FromInt((int)wxLIST_NEXT_LEFT)); + PyDict_SetItemString(d,"LIST_NEXT_RIGHT", SWIG_PyObj_FromInt((int)wxLIST_NEXT_RIGHT)); + PyDict_SetItemString(d,"LIST_ALIGN_DEFAULT", SWIG_PyObj_FromInt((int)wxLIST_ALIGN_DEFAULT)); + PyDict_SetItemString(d,"LIST_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxLIST_ALIGN_LEFT)); + PyDict_SetItemString(d,"LIST_ALIGN_TOP", SWIG_PyObj_FromInt((int)wxLIST_ALIGN_TOP)); + PyDict_SetItemString(d,"LIST_ALIGN_SNAP_TO_GRID", SWIG_PyObj_FromInt((int)wxLIST_ALIGN_SNAP_TO_GRID)); + PyDict_SetItemString(d,"LIST_FORMAT_LEFT", SWIG_PyObj_FromInt((int)wxLIST_FORMAT_LEFT)); + PyDict_SetItemString(d,"LIST_FORMAT_RIGHT", SWIG_PyObj_FromInt((int)wxLIST_FORMAT_RIGHT)); + PyDict_SetItemString(d,"LIST_FORMAT_CENTRE", SWIG_PyObj_FromInt((int)wxLIST_FORMAT_CENTRE)); + PyDict_SetItemString(d,"LIST_FORMAT_CENTER", SWIG_PyObj_FromInt((int)wxLIST_FORMAT_CENTER)); + PyDict_SetItemString(d,"LIST_AUTOSIZE", SWIG_PyObj_FromInt((int)wxLIST_AUTOSIZE)); + PyDict_SetItemString(d,"LIST_AUTOSIZE_USEHEADER", SWIG_PyObj_FromInt((int)wxLIST_AUTOSIZE_USEHEADER)); + PyDict_SetItemString(d,"LIST_RECT_BOUNDS", SWIG_PyObj_FromInt((int)wxLIST_RECT_BOUNDS)); + PyDict_SetItemString(d,"LIST_RECT_ICON", SWIG_PyObj_FromInt((int)wxLIST_RECT_ICON)); + PyDict_SetItemString(d,"LIST_RECT_LABEL", SWIG_PyObj_FromInt((int)wxLIST_RECT_LABEL)); + PyDict_SetItemString(d,"LIST_FIND_UP", SWIG_PyObj_FromInt((int)wxLIST_FIND_UP)); + PyDict_SetItemString(d,"LIST_FIND_DOWN", SWIG_PyObj_FromInt((int)wxLIST_FIND_DOWN)); + PyDict_SetItemString(d,"LIST_FIND_LEFT", SWIG_PyObj_FromInt((int)wxLIST_FIND_LEFT)); + PyDict_SetItemString(d,"LIST_FIND_RIGHT", SWIG_PyObj_FromInt((int)wxLIST_FIND_RIGHT)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_RDRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_RDRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)); @@ -28728,6 +30933,41 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl"); SWIG_addvarlink(SWIG_globals,(char*)"TreeCtrlNameStr",_wrap_TreeCtrlNameStr_get, _wrap_TreeCtrlNameStr_set); + PyDict_SetItemString(d,"TR_NO_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_NO_BUTTONS)); + PyDict_SetItemString(d,"TR_HAS_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_HAS_BUTTONS)); + PyDict_SetItemString(d,"TR_NO_LINES", SWIG_PyObj_FromInt((int)wxTR_NO_LINES)); + PyDict_SetItemString(d,"TR_LINES_AT_ROOT", SWIG_PyObj_FromInt((int)wxTR_LINES_AT_ROOT)); + PyDict_SetItemString(d,"TR_SINGLE", SWIG_PyObj_FromInt((int)wxTR_SINGLE)); + PyDict_SetItemString(d,"TR_MULTIPLE", SWIG_PyObj_FromInt((int)wxTR_MULTIPLE)); + PyDict_SetItemString(d,"TR_EXTENDED", SWIG_PyObj_FromInt((int)wxTR_EXTENDED)); + PyDict_SetItemString(d,"TR_HAS_VARIABLE_ROW_HEIGHT", SWIG_PyObj_FromInt((int)wxTR_HAS_VARIABLE_ROW_HEIGHT)); + PyDict_SetItemString(d,"TR_EDIT_LABELS", SWIG_PyObj_FromInt((int)wxTR_EDIT_LABELS)); + PyDict_SetItemString(d,"TR_HIDE_ROOT", SWIG_PyObj_FromInt((int)wxTR_HIDE_ROOT)); + PyDict_SetItemString(d,"TR_ROW_LINES", SWIG_PyObj_FromInt((int)wxTR_ROW_LINES)); + PyDict_SetItemString(d,"TR_FULL_ROW_HIGHLIGHT", SWIG_PyObj_FromInt((int)wxTR_FULL_ROW_HIGHLIGHT)); + PyDict_SetItemString(d,"TR_DEFAULT_STYLE", SWIG_PyObj_FromInt((int)wxTR_DEFAULT_STYLE)); + PyDict_SetItemString(d,"TR_TWIST_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_TWIST_BUTTONS)); + PyDict_SetItemString(d,"TR_MAC_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_MAC_BUTTONS)); + PyDict_SetItemString(d,"TR_AQUA_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_AQUA_BUTTONS)); + PyDict_SetItemString(d,"TreeItemIcon_Normal", SWIG_PyObj_FromInt((int)wxTreeItemIcon_Normal)); + PyDict_SetItemString(d,"TreeItemIcon_Selected", SWIG_PyObj_FromInt((int)wxTreeItemIcon_Selected)); + PyDict_SetItemString(d,"TreeItemIcon_Expanded", SWIG_PyObj_FromInt((int)wxTreeItemIcon_Expanded)); + PyDict_SetItemString(d,"TreeItemIcon_SelectedExpanded", SWIG_PyObj_FromInt((int)wxTreeItemIcon_SelectedExpanded)); + PyDict_SetItemString(d,"TreeItemIcon_Max", SWIG_PyObj_FromInt((int)wxTreeItemIcon_Max)); + PyDict_SetItemString(d,"TREE_HITTEST_ABOVE", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ABOVE)); + PyDict_SetItemString(d,"TREE_HITTEST_BELOW", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_BELOW)); + PyDict_SetItemString(d,"TREE_HITTEST_NOWHERE", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMBUTTON", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMBUTTON)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMICON", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMICON)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMINDENT", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMINDENT)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMLABEL", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMLABEL)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMRIGHT", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMRIGHT)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMSTATEICON", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMSTATEICON)); + PyDict_SetItemString(d,"TREE_HITTEST_TOLEFT", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_TOLEFT)); + PyDict_SetItemString(d,"TREE_HITTEST_TORIGHT", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_TORIGHT)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMUPPERPART", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMUPPERPART)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMLOWERPART", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMLOWERPART)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEM", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEM)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_RDRAG", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_RDRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT)); @@ -28754,6 +30994,13 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl"); SWIG_addvarlink(SWIG_globals,(char*)"DirDialogDefaultFolderStr",_wrap_DirDialogDefaultFolderStr_get, _wrap_DirDialogDefaultFolderStr_set); + PyDict_SetItemString(d,"DIRCTRL_DIR_ONLY", SWIG_PyObj_FromInt((int)wxDIRCTRL_DIR_ONLY)); + PyDict_SetItemString(d,"DIRCTRL_SELECT_FIRST", SWIG_PyObj_FromInt((int)wxDIRCTRL_SELECT_FIRST)); + PyDict_SetItemString(d,"DIRCTRL_SHOW_FILTERS", SWIG_PyObj_FromInt((int)wxDIRCTRL_SHOW_FILTERS)); + PyDict_SetItemString(d,"DIRCTRL_3D_INTERNAL", SWIG_PyObj_FromInt((int)wxDIRCTRL_3D_INTERNAL)); + PyDict_SetItemString(d,"DIRCTRL_EDIT_LABELS", SWIG_PyObj_FromInt((int)wxDIRCTRL_EDIT_LABELS)); + PyDict_SetItemString(d,"FRAME_EX_CONTEXTHELP", SWIG_PyObj_FromInt((int)wxFRAME_EX_CONTEXTHELP)); + PyDict_SetItemString(d,"DIALOG_EX_CONTEXTHELP", SWIG_PyObj_FromInt((int)wxDIALOG_EX_CONTEXTHELP)); PyDict_SetItemString(d, "wxEVT_HELP", PyInt_FromLong(wxEVT_HELP)); PyDict_SetItemString(d, "wxEVT_DETAILED_HELP", PyInt_FromLong(wxEVT_DETAILED_HELP)); diff --git a/wxPython/src/mac/core_wrap.cpp b/wxPython/src/mac/core_wrap.cpp index 988bc1f04f..ae0e9d17d5 100644 --- a/wxPython/src/mac/core_wrap.cpp +++ b/wxPython/src/mac/core_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -424,11 +273,11 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxArrayString swig_types[40] #define SWIGTYPE_p_wxShowEvent swig_types[41] #define SWIGTYPE_p_wxToolTip swig_types[42] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[43] -#define SWIGTYPE_p_wxIconizeEvent swig_types[44] -#define SWIGTYPE_p_wxActivateEvent swig_types[45] -#define SWIGTYPE_p_wxMoveEvent swig_types[46] -#define SWIGTYPE_p_wxSizeEvent swig_types[47] +#define SWIGTYPE_p_wxIconizeEvent swig_types[43] +#define SWIGTYPE_p_wxActivateEvent swig_types[44] +#define SWIGTYPE_p_wxMoveEvent swig_types[45] +#define SWIGTYPE_p_wxSizeEvent swig_types[46] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[47] #define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[48] #define SWIGTYPE_p_wxWindowCreateEvent swig_types[49] #define SWIGTYPE_p_wxIdleEvent swig_types[50] @@ -444,58 +293,59 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPNGHandler swig_types[60] #define SWIGTYPE_p_wxANIHandler swig_types[61] #define SWIGTYPE_p_wxMemoryFSHandler swig_types[62] -#define SWIGTYPE_p_wxEvtHandler swig_types[63] -#define SWIGTYPE_p_wxCURHandler swig_types[64] -#define SWIGTYPE_p_wxICOHandler swig_types[65] -#define SWIGTYPE_p_wxBMPHandler swig_types[66] -#define SWIGTYPE_p_wxImageHandler swig_types[67] -#define SWIGTYPE_p_wxFileSystemHandler swig_types[68] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[69] -#define SWIGTYPE_p_wxInternetFSHandler swig_types[70] -#define SWIGTYPE_p_wxZipFSHandler swig_types[71] +#define SWIGTYPE_p_wxZipFSHandler swig_types[63] +#define SWIGTYPE_p_wxEvtHandler swig_types[64] +#define SWIGTYPE_p_wxCURHandler swig_types[65] +#define SWIGTYPE_p_wxICOHandler swig_types[66] +#define SWIGTYPE_p_wxBMPHandler swig_types[67] +#define SWIGTYPE_p_wxImageHandler swig_types[68] +#define SWIGTYPE_p_wxFileSystemHandler swig_types[69] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[70] +#define SWIGTYPE_p_wxInternetFSHandler swig_types[71] #define SWIGTYPE_p_wxRect swig_types[72] #define SWIGTYPE_p_wxGBSpan swig_types[73] #define SWIGTYPE_p_wxPropagateOnce swig_types[74] #define SWIGTYPE_p_wxAcceleratorTable swig_types[75] -#define SWIGTYPE_p_wxGBPosition swig_types[76] -#define SWIGTYPE_p_wxImage swig_types[77] -#define SWIGTYPE_p_wxFrame swig_types[78] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[79] -#define SWIGTYPE_p_wxImageHistogram swig_types[80] -#define SWIGTYPE_p_byte swig_types[81] -#define SWIGTYPE_p_wxPoint swig_types[82] -#define SWIGTYPE_p_wxCursor swig_types[83] -#define SWIGTYPE_p_wxObject swig_types[84] -#define SWIGTYPE_p_wxPyInputStream swig_types[85] -#define SWIGTYPE_p_wxOutputStream swig_types[86] -#define SWIGTYPE_p_wxInputStream swig_types[87] -#define SWIGTYPE_p_wxDateTime swig_types[88] -#define SWIGTYPE_p_wxKeyEvent swig_types[89] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[90] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[91] -#define SWIGTYPE_p_wxWindow swig_types[92] -#define SWIGTYPE_p_wxMenuBar swig_types[93] -#define SWIGTYPE_p_wxString swig_types[94] -#define SWIGTYPE_p_wxFileSystem swig_types[95] -#define SWIGTYPE_p_wxBitmap swig_types[96] -#define SWIGTYPE_p_wxMenuEvent swig_types[97] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[98] -#define SWIGTYPE_p_unsigned_char swig_types[99] -#define SWIGTYPE_p_wxCloseEvent swig_types[100] -#define SWIGTYPE_p_wxEraseEvent swig_types[101] -#define SWIGTYPE_p_wxMouseEvent swig_types[102] -#define SWIGTYPE_p_wxPyApp swig_types[103] -#define SWIGTYPE_p_wxCommandEvent swig_types[104] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[105] -#define SWIGTYPE_p_wxPyDropTarget swig_types[106] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[107] -#define SWIGTYPE_p_wxFocusEvent swig_types[108] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[109] -#define SWIGTYPE_p_wxControlWithItems swig_types[110] -#define SWIGTYPE_p_wxColour swig_types[111] -#define SWIGTYPE_p_wxValidator swig_types[112] -#define SWIGTYPE_p_wxPyValidator swig_types[113] -static swig_type_info *swig_types[115]; +#define SWIGTYPE_p_char swig_types[76] +#define SWIGTYPE_p_wxGBPosition swig_types[77] +#define SWIGTYPE_p_wxImage swig_types[78] +#define SWIGTYPE_p_wxFrame swig_types[79] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[80] +#define SWIGTYPE_p_wxImageHistogram swig_types[81] +#define SWIGTYPE_p_byte swig_types[82] +#define SWIGTYPE_p_wxPoint swig_types[83] +#define SWIGTYPE_p_wxCursor swig_types[84] +#define SWIGTYPE_p_wxObject swig_types[85] +#define SWIGTYPE_p_wxPyInputStream swig_types[86] +#define SWIGTYPE_p_wxOutputStream swig_types[87] +#define SWIGTYPE_p_wxInputStream swig_types[88] +#define SWIGTYPE_p_wxDateTime swig_types[89] +#define SWIGTYPE_p_wxKeyEvent swig_types[90] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[91] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[92] +#define SWIGTYPE_p_wxWindow swig_types[93] +#define SWIGTYPE_p_wxMenuBar swig_types[94] +#define SWIGTYPE_p_wxString swig_types[95] +#define SWIGTYPE_p_wxFileSystem swig_types[96] +#define SWIGTYPE_p_wxBitmap swig_types[97] +#define SWIGTYPE_p_wxMenuEvent swig_types[98] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[99] +#define SWIGTYPE_p_unsigned_char swig_types[100] +#define SWIGTYPE_p_wxCloseEvent swig_types[101] +#define SWIGTYPE_p_wxEraseEvent swig_types[102] +#define SWIGTYPE_p_wxMouseEvent swig_types[103] +#define SWIGTYPE_p_wxPyApp swig_types[104] +#define SWIGTYPE_p_wxCommandEvent swig_types[105] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[106] +#define SWIGTYPE_p_wxPyDropTarget swig_types[107] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[108] +#define SWIGTYPE_p_wxFocusEvent swig_types[109] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[110] +#define SWIGTYPE_p_wxControlWithItems swig_types[111] +#define SWIGTYPE_p_wxColour swig_types[112] +#define SWIGTYPE_p_wxValidator swig_types[113] +#define SWIGTYPE_p_wxPyValidator swig_types[114] +static swig_type_info *swig_types[116]; /* -------- TYPES TABLE (END) -------- */ @@ -507,6 +357,44 @@ static swig_type_info *swig_types[115]; #define SWIG_name "_core" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython_int.h" #include "wx/wxPython/pyclasses.h" @@ -646,6 +534,17 @@ static wxPyCoreAPI API = { (p_SWIG_Python_InstallConstants_t)SWIG_Python_InstallConstants, (p_SWIG_Python_MustGetPtr_t)SWIG_Python_MustGetPtr, + (p_SWIG_PyObj_AsCharPtr_t)SWIG_PyObj_AsCharPtr, + (p_SWIG_PyObj_FromCharPtr_t)SWIG_PyObj_FromCharPtr, + (p_SWIG_PyObj_AsUnsignedLong_t)SWIG_PyObj_AsUnsignedLong, + (p_SWIG_PyObj_AsLongInRange_t)SWIG_PyObj_AsLongInRange, + (p_SWIG_PyObj_AsUnsignedLongInRange_t)SWIG_PyObj_AsUnsignedLongInRange, + (p_SWIG_PyObj_AsNewCharPtr_t)SWIG_PyObj_AsNewCharPtr, + (p_SWIG_PyObj_AsCharPtrAndSize_t)SWIG_PyObj_AsCharPtrAndSize, + (p_SWIG_PyObj_AsCharArray_t)SWIG_PyObj_AsCharArray, + (p_SWIG_PyObj_FromCharArray_t)SWIG_PyObj_FromCharArray, + (p_SWIG_PyObj_AsFloatConv_t)SWIG_PyObj_AsFloatConv, + wxPyCheckSwigType, wxPyConstructObject, wxPyConvertSwigPtr, @@ -733,6 +632,23 @@ void wxObject_Destroy(wxObject *self){ #define wxCURSOR_COPY_ARROW wxCURSOR_ARROW #endif + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + PyObject *wxSize_Get(wxSize *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); @@ -741,6 +657,22 @@ PyObject *wxSize_Get(wxSize *self){ wxPyEndBlockThreads(); return tup; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + void wxRealPoint_Set(wxRealPoint *self,double x,double y){ self->x = x; self->y = y; @@ -753,6 +685,13 @@ PyObject *wxRealPoint_Get(wxRealPoint *self){ wxPyEndBlockThreads(); return tup; } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + void wxPoint_Set(wxPoint *self,long x,long y){ self->x = x; self->y = y; @@ -851,6 +790,41 @@ wxPyInputStream *new_wxPyInputStream(PyObject *p){ else return NULL; } + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromChar(char c) +{ + return PyString_FromStringAndSize(&c,1); +} + + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + +SWIGSTATIC(char) +SWIG_PyObj_AsChar(PyObject *obj) +{ + char c = 0; + if (PyInt_Check(obj) || PyLong_Check(obj)) { + c = numeric_cast(char, + SWIG_PyObj_AsLongInRange(obj, "char",CHAR_MIN, CHAR_MAX)); + } else { + char* cptr; size_t csize; + SWIG_PyObj_AsCharPtrAndSize(obj, 0, &cptr, &csize); + if (csize == 1) { + c = cptr[0]; + } else { + PyErr_SetString(PyExc_TypeError, "a char is expected"); + } + } + return c; +} + void wxOutputStream_write(wxOutputStream *self,PyObject *obj){ // We use only strings for the streams, not unicode PyObject* str = PyObject_Str(obj); @@ -906,6 +880,13 @@ IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler, IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext); +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + wxString wxFileSystem_URLToFileName(const wxString& url) { wxFileName fname = wxFileSystem::URLToFileName(url); return fname.GetFullPath(); @@ -935,6 +916,14 @@ IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext #include "wx/wxPython/pyistream.h" + +SWIGSTATIC(unsigned char) +SWIG_PyObj_AsUnsignedChar(PyObject *obj) +{ + return numeric_cast(unsigned char, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned char", UCHAR_MAX)); +} + wxImage *new_wxImage(int width,int height,bool clear){ if (width > 0 && height > 0) return new wxImage(width, height, clear); @@ -1098,6 +1087,17 @@ int wxKeyEvent_GetUniChar(wxKeyEvent *self){ return 0; #endif } + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){ self->m_size = size; } @@ -1232,6 +1232,13 @@ void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObject *clientD } + +SWIGSTATIC(float) +SWIG_PyObj_AsFloat(PyObject *obj) +{ + return SWIG_PyObj_AsFloatConv(obj, SWIG_PyObj_AsDouble); +} + PyObject *wxSizerItem_GetUserData(wxSizerItem *self){ wxPyUserData* data = (wxPyUserData*)self->GetUserData(); if (data) { @@ -1482,7 +1489,7 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const & #ifdef __cplusplus extern "C" { #endif -static int _wrap_EmptyString_set(PyObject *_val) { +static int _wrap_EmptyString_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable EmptyString is read-only."); return 1; } @@ -1569,12 +1576,17 @@ static PyObject *_wrap_Size_width_set(PyObject *self, PyObject *args, PyObject * wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_width_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_width_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1597,7 +1609,7 @@ static PyObject *_wrap_Size_width_get(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1609,12 +1621,17 @@ static PyObject *_wrap_Size_height_set(PyObject *self, PyObject *args, PyObject wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_height_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_height_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1637,7 +1654,7 @@ static PyObject *_wrap_Size_height_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1649,11 +1666,25 @@ static PyObject *_wrap_new_Size(PyObject *self, PyObject *args, PyObject *kwargs int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxSize *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Size",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Size",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSize *)new wxSize(arg1,arg2); @@ -1717,7 +1748,7 @@ static PyObject *_wrap_Size___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1749,7 +1780,7 @@ static PyObject *_wrap_Size___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1896,12 +1927,22 @@ static PyObject *_wrap_Size_Set(PyObject *self, PyObject *args, PyObject *kwargs int arg2 ; int 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 *)"Oii:Size_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Size_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set(arg2,arg3); @@ -1921,12 +1962,17 @@ static PyObject *_wrap_Size_SetWidth(PyObject *self, PyObject *args, PyObject *k wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -1946,12 +1992,17 @@ static PyObject *_wrap_Size_SetHeight(PyObject *self, PyObject *args, PyObject * wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -1984,7 +2035,7 @@ static PyObject *_wrap_Size_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2009,7 +2060,7 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2053,12 +2104,17 @@ static PyObject *_wrap_RealPoint_x_set(PyObject *self, PyObject *args, PyObject wxRealPoint *arg1 = (wxRealPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:RealPoint_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2081,7 +2137,7 @@ static PyObject *_wrap_RealPoint_x_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (double) ((arg1)->x); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -2093,12 +2149,17 @@ static PyObject *_wrap_RealPoint_y_set(PyObject *self, PyObject *args, PyObject wxRealPoint *arg1 = (wxRealPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:RealPoint_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2121,7 +2182,7 @@ static PyObject *_wrap_RealPoint_y_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (double) ((arg1)->y); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -2133,11 +2194,25 @@ static PyObject *_wrap_new_RealPoint(PyObject *self, PyObject *args, PyObject *k double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxRealPoint *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_RealPoint",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_RealPoint",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (double) SWIG_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRealPoint *)new wxRealPoint(arg1,arg2); @@ -2201,7 +2276,7 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2233,7 +2308,7 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2318,12 +2393,22 @@ static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *k 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:RealPoint_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RealPoint_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxRealPoint_Set(arg1,arg2,arg3); @@ -2375,12 +2460,17 @@ static PyObject *_wrap_Point_x_set(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg1 = (wxPoint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Point_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2403,7 +2493,7 @@ static PyObject *_wrap_Point_x_get(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2415,12 +2505,17 @@ static PyObject *_wrap_Point_y_set(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg1 = (wxPoint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Point_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2443,7 +2538,7 @@ static PyObject *_wrap_Point_y_get(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2455,11 +2550,25 @@ static PyObject *_wrap_new_Point(PyObject *self, PyObject *args, PyObject *kwarg int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxPoint *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Point",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPoint *)new wxPoint(arg1,arg2); @@ -2523,7 +2632,7 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2555,7 +2664,7 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2710,12 +2819,22 @@ static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwarg long arg2 ; long 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 *)"Oll:Point_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Point_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPoint_Set(arg1,arg2,arg3); @@ -2769,11 +2888,39 @@ static PyObject *_wrap_new_Rect(PyObject *self, PyObject *args, PyObject *kwargs int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxRect *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_Rect",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Rect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRect *)new wxRect(arg1,arg2,arg3,arg4); @@ -2902,7 +3049,7 @@ static PyObject *_wrap_Rect_GetX(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2914,12 +3061,17 @@ static PyObject *_wrap_Rect_SetX(PyObject *self, PyObject *args, PyObject *kwarg wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetX(arg2); @@ -2952,7 +3104,7 @@ static PyObject *_wrap_Rect_GetY(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2964,12 +3116,17 @@ static PyObject *_wrap_Rect_SetY(PyObject *self, PyObject *args, PyObject *kwarg wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetY(arg2); @@ -3002,7 +3159,7 @@ static PyObject *_wrap_Rect_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3014,12 +3171,17 @@ static PyObject *_wrap_Rect_SetWidth(PyObject *self, PyObject *args, PyObject *k wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -3052,7 +3214,7 @@ static PyObject *_wrap_Rect_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3064,12 +3226,17 @@ static PyObject *_wrap_Rect_SetHeight(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -3342,7 +3509,7 @@ static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3367,7 +3534,7 @@ static PyObject *_wrap_Rect_GetTop(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3392,7 +3559,7 @@ static PyObject *_wrap_Rect_GetBottom(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3417,7 +3584,7 @@ static PyObject *_wrap_Rect_GetRight(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3429,12 +3596,17 @@ static PyObject *_wrap_Rect_SetLeft(PyObject *self, PyObject *args, PyObject *kw wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "left", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetLeft",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetLeft",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLeft(arg2); @@ -3454,12 +3626,17 @@ static PyObject *_wrap_Rect_SetRight(PyObject *self, PyObject *args, PyObject *k wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "right", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetRight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetRight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRight(arg2); @@ -3479,12 +3656,17 @@ static PyObject *_wrap_Rect_SetTop(PyObject *self, PyObject *args, PyObject *kwa wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "top", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetTop",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTop",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTop(arg2); @@ -3504,12 +3686,17 @@ static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bottom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetBottom",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBottom(arg2); @@ -3531,12 +3718,22 @@ static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kw int arg3 ; wxRect *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_Inflate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Inflate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -3561,12 +3758,22 @@ static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kw int arg3 ; wxRect *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_Deflate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Deflate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -3590,12 +3797,22 @@ static PyObject *_wrap_Rect_OffsetXY(PyObject *self, PyObject *args, PyObject *k int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_OffsetXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_OffsetXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Offset(arg2,arg3); @@ -3772,7 +3989,7 @@ static PyObject *_wrap_Rect___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3804,7 +4021,7 @@ static PyObject *_wrap_Rect___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3818,12 +4035,22 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k int arg3 ; bool 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 *)"Oii:Rect_InsideXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_InsideXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxRect const *)arg1)->Inside(arg2,arg3); @@ -3831,7 +4058,7 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3863,7 +4090,7 @@ static PyObject *_wrap_Rect_Inside(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3895,7 +4122,7 @@ static PyObject *_wrap_Rect_Intersects(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3907,12 +4134,17 @@ static PyObject *_wrap_Rect_x_set(PyObject *self, PyObject *args, PyObject *kwar wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -3935,7 +4167,7 @@ static PyObject *_wrap_Rect_x_get(PyObject *self, PyObject *args, PyObject *kwar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3947,12 +4179,17 @@ static PyObject *_wrap_Rect_y_set(PyObject *self, PyObject *args, PyObject *kwar wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -3975,7 +4212,7 @@ static PyObject *_wrap_Rect_y_get(PyObject *self, PyObject *args, PyObject *kwar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3987,12 +4224,17 @@ static PyObject *_wrap_Rect_width_set(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_width_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_width_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->width = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4015,7 +4257,7 @@ static PyObject *_wrap_Rect_width_get(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->width); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4027,12 +4269,17 @@ static PyObject *_wrap_Rect_height_set(PyObject *self, PyObject *args, PyObject wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_height_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_height_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->height = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4055,7 +4302,7 @@ static PyObject *_wrap_Rect_height_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->height); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4070,12 +4317,40 @@ static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiii:Rect_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:Rect_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxRect_Set(arg1,arg2,arg3,arg4,arg5); @@ -4155,11 +4430,25 @@ static PyObject *_wrap_new_Point2D(PyObject *self, PyObject *args, PyObject *kwa double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPoint2D *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_Point2D",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point2D",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (double) SWIG_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPoint2D *)new wxPoint2D(arg1,arg2); @@ -4326,7 +4615,7 @@ static PyObject *_wrap_Point2D_GetVectorLength(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4351,7 +4640,7 @@ static PyObject *_wrap_Point2D_GetVectorAngle(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4363,12 +4652,17 @@ static PyObject *_wrap_Point2D_SetVectorLength(PyObject *self, PyObject *args, P wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "length", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_SetVectorLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVectorLength(arg2); @@ -4388,12 +4682,17 @@ static PyObject *_wrap_Point2D_SetVectorAngle(PyObject *self, PyObject *args, Py wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "degrees", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_SetVectorAngle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorAngle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVectorAngle(arg2); @@ -4433,7 +4732,7 @@ static PyObject *_wrap_Point2D_GetDistance(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4465,7 +4764,7 @@ static PyObject *_wrap_Point2D_GetDistanceSquare(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4497,7 +4796,7 @@ static PyObject *_wrap_Point2D_GetDotProduct(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4529,7 +4828,7 @@ static PyObject *_wrap_Point2D_GetCrossProduct(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4730,7 +5029,7 @@ static PyObject *_wrap_Point2D___eq__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4762,7 +5061,7 @@ static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4774,12 +5073,17 @@ static PyObject *_wrap_Point2D_x_set(PyObject *self, PyObject *args, PyObject *k wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4802,7 +5106,7 @@ static PyObject *_wrap_Point2D_x_get(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (double) ((arg1)->m_x); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4814,12 +5118,17 @@ static PyObject *_wrap_Point2D_y_set(PyObject *self, PyObject *args, PyObject *k wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4842,7 +5151,7 @@ static PyObject *_wrap_Point2D_y_get(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (double) ((arg1)->m_y); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4855,12 +5164,26 @@ static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwa double arg2 = (double) 0 ; double arg3 = (double) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|dd:Point2D_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Point2D_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPoint2D_Set(arg1,arg2,arg3); @@ -4907,7 +5230,7 @@ static PyObject * Point2D_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_DefaultPosition_set(PyObject *_val) { +static int _wrap_DefaultPosition_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DefaultPosition is read-only."); return 1; } @@ -4921,7 +5244,7 @@ static PyObject *_wrap_DefaultPosition_get() { } -static int _wrap_DefaultSize_set(PyObject *_val) { +static int _wrap_DefaultSize_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DefaultSize is read-only."); return 1; } @@ -5026,7 +5349,7 @@ static PyObject *_wrap_InputStream_eof(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5039,12 +5362,19 @@ static PyObject *_wrap_InputStream_read(PyObject *self, PyObject *args, PyObject int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "size", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_read",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_read",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->read(arg2); @@ -5065,12 +5395,19 @@ static PyObject *_wrap_InputStream_readline(PyObject *self, PyObject *args, PyOb int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "size", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_readline",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_readline",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->readline(arg2); @@ -5091,12 +5428,19 @@ static PyObject *_wrap_InputStream_readlines(PyObject *self, PyObject *args, PyO int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sizehint", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_readlines",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_readlines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->readlines(arg2); @@ -5117,12 +5461,24 @@ static PyObject *_wrap_InputStream_seek(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "offset",(char *) "whence", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:InputStream_seek",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:InputStream_seek",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->seek(arg2,arg3); @@ -5155,7 +5511,7 @@ static PyObject *_wrap_InputStream_tell(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5180,7 +5536,7 @@ static PyObject *_wrap_InputStream_Peek(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromChar(result); + resultobj = SWIG_PyObj_FromChar((char)result); return resultobj; fail: return NULL; @@ -5205,7 +5561,7 @@ static PyObject *_wrap_InputStream_GetC(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromChar(result); + resultobj = SWIG_PyObj_FromChar((char)result); return resultobj; fail: return NULL; @@ -5230,7 +5586,7 @@ static PyObject *_wrap_InputStream_LastRead(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -5255,7 +5611,7 @@ static PyObject *_wrap_InputStream_CanRead(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5280,7 +5636,7 @@ static PyObject *_wrap_InputStream_Eof(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5293,12 +5649,17 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj char arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "c", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oc:InputStream_Ungetch",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:InputStream_Ungetch",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (char) SWIG_PyObj_AsChar(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Ungetch(arg2); @@ -5306,7 +5667,7 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5320,12 +5681,24 @@ static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObjec int arg3 = (int) wxFromStart ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|i:InputStream_SeekI",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:InputStream_SeekI",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxSeekMode) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->SeekI(arg2,(wxSeekMode )arg3); @@ -5333,7 +5706,7 @@ static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -5358,7 +5731,7 @@ static PyObject *_wrap_InputStream_TellI(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -5788,7 +6161,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5861,17 +6234,24 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FileSystemHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystemHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindFirst((wxString const &)*arg2,arg3); @@ -6243,7 +6623,7 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6352,17 +6732,24 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FileSystem_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystem_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindFirst((wxString const &)*arg2,arg3); @@ -6610,7 +6997,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6729,7 +7116,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6802,17 +7189,24 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:ZipFSHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ZipFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxZipFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindFirst((wxString const &)*arg2,arg3); @@ -6887,11 +7281,12 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "image",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:__wxMemoryFSHandler_AddFile_wxImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:__wxMemoryFSHandler_AddFile_wxImage",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -6901,6 +7296,10 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); __wxMemoryFSHandler_AddFile_wxImage((wxString const &)*arg1,*arg2,arg3); @@ -6931,11 +7330,12 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "bitmap",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:__wxMemoryFSHandler_AddFile_wxBitmap",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:__wxMemoryFSHandler_AddFile_wxBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -6945,6 +7345,10 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); __wxMemoryFSHandler_AddFile_wxBitmap((wxString const &)*arg1,(wxBitmap const &)*arg2,arg3); @@ -7092,7 +7496,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7165,17 +7569,24 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args, bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:MemoryFSHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MemoryFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMemoryFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindFirst((wxString const &)*arg2,arg3); @@ -7322,7 +7733,7 @@ static PyObject *_wrap_ImageHandler_GetType(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -7386,7 +7797,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7486,12 +7897,17 @@ static PyObject *_wrap_ImageHandler_SetType(PyObject *self, PyObject *args, PyOb wxImageHandler *arg1 = (wxImageHandler *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ImageHandler_SetType",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetType",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetType(arg2); @@ -7590,15 +8006,15 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageHistogram_MakeKey",kwnames,&obj0,&obj1,&obj2)) goto fail; { - arg1 = (unsigned char) SPyObj_AsUnsignedChar(obj0); + arg1 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj0); if (PyErr_Occurred()) SWIG_fail; } { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -7608,7 +8024,7 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -7643,19 +8059,19 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHistogram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg5 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg5 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg6 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg6 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { - arg7 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg7 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7666,7 +8082,7 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -7700,16 +8116,30 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg wxImage *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|li:new_Image",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_Image",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage((wxString const &)*arg1,arg2,arg3); @@ -7766,11 +8196,12 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "name",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:new_ImageFromMime",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_ImageFromMime",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -7781,6 +8212,12 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage((wxString const &)*arg1,(wxString const &)*arg2,arg3); @@ -7820,11 +8257,13 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj wxPyInputStream *temp1 ; bool created1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "stream",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|li:new_ImageFromStream",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_ImageFromStream",kwnames,&obj0,&obj1,&obj2)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; @@ -7839,6 +8278,18 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj created1 = True; } } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage(*arg1,arg2,arg3); @@ -7872,11 +8323,12 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "stream",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:new_ImageFromStreamMime",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_ImageFromStreamMime",kwnames,&obj0,&obj1,&obj2)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; @@ -7896,6 +8348,12 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage(*arg1,(wxString const &)*arg2,arg3); @@ -7932,15 +8390,29 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject * int arg2 = (int) 0 ; bool arg3 = (bool) True ; wxImage *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "clear", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_EmptyImage",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_EmptyImage",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7992,12 +8464,22 @@ static PyObject *_wrap_new_ImageFromData(PyObject *self, PyObject *args, PyObjec int arg2 ; unsigned char *arg3 = (unsigned char *) 0 ; wxImage *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiO:new_ImageFromData",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_ImageFromData",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8019,12 +8501,22 @@ static PyObject *_wrap_Image_Create(PyObject *self, PyObject *args, PyObject *kw int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Create",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Create(arg2,arg3); @@ -8070,12 +8562,22 @@ static PyObject *_wrap_Image_Scale(PyObject *self, PyObject *args, PyObject *kwa int arg3 ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Scale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->Scale(arg2,arg3); @@ -8101,12 +8603,22 @@ static PyObject *_wrap_Image_ShrinkBy(PyObject *self, PyObject *args, PyObject * int arg3 ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xFactor",(char *) "yFactor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_ShrinkBy",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_ShrinkBy",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxImage const *)arg1)->ShrinkBy(arg2,arg3); @@ -8132,12 +8644,22 @@ static PyObject *_wrap_Image_Rescale(PyObject *self, PyObject *args, PyObject *k int arg3 ; wxImage *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Rescale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Rescale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -8164,6 +8686,8 @@ static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kw unsigned char arg5 ; unsigned char arg6 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; @@ -8171,18 +8695,26 @@ static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "x",(char *) "y",(char *) "r",(char *) "g",(char *) "b", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiOOO:Image_SetRGB",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Image_SetRGB",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { - arg5 = (unsigned char) SPyObj_AsUnsignedChar(obj4); + arg5 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj4); if (PyErr_Occurred()) SWIG_fail; } { - arg6 = (unsigned char) SPyObj_AsUnsignedChar(obj5); + arg6 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -8206,12 +8738,22 @@ static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kw int arg3 ; unsigned char 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 *)"Oii:Image_GetRed",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetRed",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetRed(arg2,arg3); @@ -8219,7 +8761,7 @@ static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8233,12 +8775,22 @@ static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char 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 *)"Oii:Image_GetGreen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetGreen",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetGreen(arg2,arg3); @@ -8246,7 +8798,7 @@ static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8260,12 +8812,22 @@ static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *k int arg3 ; unsigned char 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 *)"Oii:Image_GetBlue",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetBlue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetBlue(arg2,arg3); @@ -8273,7 +8835,7 @@ static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8287,15 +8849,25 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "alpha", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Image_SetAlpha",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -8319,12 +8891,22 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char 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 *)"Oii:Image_GetAlpha",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetAlpha",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetAlpha(arg2,arg3); @@ -8332,7 +8914,7 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8357,7 +8939,7 @@ static PyObject *_wrap_Image_HasAlpha(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8392,19 +8974,19 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg5 = (byte) SPyObj_AsUnsignedChar(obj1); + arg5 = (byte) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg6 = (byte) SPyObj_AsUnsignedChar(obj2); + arg6 = (byte) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { - arg7 = (byte) SPyObj_AsUnsignedChar(obj3); + arg7 = (byte) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -8415,7 +8997,7 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -8458,15 +9040,15 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg3 = (byte) SPyObj_AsUnsignedChar(obj2); + arg3 = (byte) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (byte) SPyObj_AsUnsignedChar(obj3); + arg4 = (byte) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { - arg5 = (byte) SPyObj_AsUnsignedChar(obj4); + arg5 = (byte) SWIG_PyObj_AsUnsignedChar(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8476,7 +9058,7 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8506,7 +9088,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -8528,16 +9110,23 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj int result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Image_GetImageCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_GetImageCount",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxImage::GetImageCount((wxString const &)*arg1,arg2); @@ -8545,7 +9134,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp1) delete arg1; @@ -8570,17 +9159,31 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|li:Image_LoadFile",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Image_LoadFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3,arg4); @@ -8588,7 +9191,7 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8615,11 +9218,12 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Image_LoadMimeFile",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_LoadMimeFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -8631,6 +9235,12 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxString const &)*arg3,arg4); @@ -8638,7 +9248,7 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8670,17 +9280,22 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Image_SaveFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SaveFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SaveFile((wxString const &)*arg2,arg3); @@ -8688,7 +9303,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8737,7 +9352,7 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8793,7 +9408,7 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (created1) delete arg1; @@ -8819,11 +9434,13 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject bool created2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stream",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|li:Image_LoadStream",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Image_LoadStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { @@ -8839,6 +9456,18 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject created2 = True; } } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile(*arg2,arg3,arg4); @@ -8846,7 +9475,7 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (created2) delete arg2; @@ -8874,11 +9503,12 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stream",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Image_LoadMimeStream",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_LoadMimeStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { @@ -8899,6 +9529,12 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile(*arg2,(wxString const &)*arg3,arg4); @@ -8906,7 +9542,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (created2) delete arg2; @@ -8947,7 +9583,7 @@ static PyObject *_wrap_Image_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8972,7 +9608,7 @@ static PyObject *_wrap_Image_GetWidth(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8997,7 +9633,7 @@ static PyObject *_wrap_Image_GetHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9077,16 +9713,26 @@ static PyObject *_wrap_Image_Paste(PyObject *self, PyObject *args, PyObject *kwa int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:Image_Paste",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_Paste",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Paste((wxImage const &)*arg2,arg3,arg4); @@ -9326,15 +9972,15 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetMaskColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -9369,7 +10015,7 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9394,7 +10040,7 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9419,7 +10065,7 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9440,7 +10086,7 @@ static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9476,7 +10122,7 @@ static PyObject *_wrap_Image_HasMask(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9493,6 +10139,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw SwigValueWrapper< wxImage > result; wxPoint temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -9500,15 +10147,19 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "angle",(char *) "centre_of_rotation",(char *) "interpolating",(char *) "offset_after_rotation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO|OO:Image_Rotate",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Image_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -9548,7 +10199,7 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9585,7 +10236,7 @@ static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kw if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9630,27 +10281,27 @@ static PyObject *_wrap_Image_Replace(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:Image_Replace",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { - arg5 = (unsigned char) SPyObj_AsUnsignedChar(obj4); + arg5 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj4); if (PyErr_Occurred()) SWIG_fail; } { - arg6 = (unsigned char) SPyObj_AsUnsignedChar(obj5); + arg6 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj5); if (PyErr_Occurred()) SWIG_fail; } { - arg7 = (unsigned char) SPyObj_AsUnsignedChar(obj6); + arg7 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -9685,15 +10336,15 @@ static PyObject *_wrap_Image_ConvertToMono(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMono",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -9778,17 +10429,22 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Image_SetOptionInt",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SetOptionInt",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOption((wxString const &)*arg2,arg3); @@ -9884,7 +10540,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -9925,7 +10581,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9955,7 +10611,7 @@ static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (unsigned long) SPyObj_AsUnsignedLong(obj1); + arg2 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9966,7 +10622,7 @@ static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -9997,7 +10653,7 @@ static PyObject *_wrap_Image_ComputeHistogram(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -10075,7 +10731,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -10165,15 +10821,15 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMonoBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -10222,7 +10878,7 @@ static PyObject *_wrap_InitAllImageHandlers(PyObject *self, PyObject *args, PyOb } -static int _wrap_NullImage_set(PyObject *_val) { +static int _wrap_NullImage_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullImage is read-only."); return 1; } @@ -10236,7 +10892,7 @@ static PyObject *_wrap_NullImage_get() { } -static int _wrap_IMAGE_OPTION_BMP_FORMAT_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_BMP_FORMAT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_BMP_FORMAT is read-only."); return 1; } @@ -10256,7 +10912,7 @@ static PyObject *_wrap_IMAGE_OPTION_BMP_FORMAT_get() { } -static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_X_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_X_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_CUR_HOTSPOT_X is read-only."); return 1; } @@ -10276,7 +10932,7 @@ static PyObject *_wrap_IMAGE_OPTION_CUR_HOTSPOT_X_get() { } -static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_CUR_HOTSPOT_Y is read-only."); return 1; } @@ -10296,7 +10952,7 @@ static PyObject *_wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_get() { } -static int _wrap_IMAGE_OPTION_RESOLUTION_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_RESOLUTION_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTION is read-only."); return 1; } @@ -10316,7 +10972,7 @@ static PyObject *_wrap_IMAGE_OPTION_RESOLUTION_get() { } -static int _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTIONUNIT is read-only."); return 1; } @@ -10805,7 +11461,7 @@ static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10825,7 +11481,7 @@ static PyObject *_wrap_EvtHandler_SetEvtHandlerEnabled(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetEvtHandlerEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -10866,7 +11522,7 @@ static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10935,13 +11591,28 @@ static PyObject *_wrap_EvtHandler_Connect(PyObject *self, PyObject *args, PyObje int arg4 ; PyObject *arg5 = (PyObject *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "lastId",(char *) "eventType",(char *) "func", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:EvtHandler_Connect",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:EvtHandler_Connect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } arg5 = obj4; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10965,12 +11636,31 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO wxEventType arg4 = (wxEventType) wxEVT_NULL ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "lastId",(char *) "eventType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:EvtHandler_Disconnect",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:EvtHandler_Disconnect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxEventType) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxEvtHandler_Disconnect(arg1,arg2,arg3,arg4); @@ -10978,7 +11668,7 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11034,7 +11724,7 @@ static PyObject *_wrap_NewEventType(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11070,12 +11760,17 @@ static PyObject *_wrap_Event_SetEventType(PyObject *self, PyObject *args, PyObje wxEvent *arg1 = (wxEvent *) 0 ; wxEventType arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "typ", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_SetEventType",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetEventType",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEventType(arg2); @@ -11108,7 +11803,7 @@ static PyObject *_wrap_Event_GetEventType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11187,7 +11882,7 @@ static PyObject *_wrap_Event_GetTimestamp(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -11199,12 +11894,19 @@ static PyObject *_wrap_Event_SetTimestamp(PyObject *self, PyObject *args, PyObje wxEvent *arg1 = (wxEvent *) 0 ; long arg2 = (long) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ts", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Event_SetTimestamp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Event_SetTimestamp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTimestamp(arg2); @@ -11237,7 +11939,7 @@ static PyObject *_wrap_Event_GetId(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11249,12 +11951,17 @@ static PyObject *_wrap_Event_SetId(PyObject *self, PyObject *args, PyObject *kwa wxEvent *arg1 = (wxEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -11287,7 +11994,7 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11308,7 +12015,7 @@ static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -11344,7 +12051,7 @@ static PyObject *_wrap_Event_GetSkipped(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11369,7 +12076,7 @@ static PyObject *_wrap_Event_ShouldPropagate(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11394,7 +12101,7 @@ static PyObject *_wrap_Event_StopPropagation(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11406,12 +12113,17 @@ static PyObject *_wrap_Event_ResumePropagation(PyObject *self, PyObject *args, P wxEvent *arg1 = (wxEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "propagationLevel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_ResumePropagation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_ResumePropagation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ResumePropagation(arg2); @@ -11581,11 +12293,25 @@ static PyObject *_wrap_new_CommandEvent(PyObject *self, PyObject *args, PyObject wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxCommandEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_CommandEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CommandEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCommandEvent *)new wxCommandEvent(arg1,arg2); @@ -11618,7 +12344,7 @@ static PyObject *_wrap_CommandEvent_GetSelection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11714,7 +12440,7 @@ static PyObject *_wrap_CommandEvent_IsChecked(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11739,7 +12465,7 @@ static PyObject *_wrap_CommandEvent_IsSelection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11751,12 +12477,17 @@ static PyObject *_wrap_CommandEvent_SetExtraLong(PyObject *self, PyObject *args, wxCommandEvent *arg1 = (wxCommandEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "extraLong", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:CommandEvent_SetExtraLong",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetExtraLong",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraLong(arg2); @@ -11789,7 +12520,7 @@ static PyObject *_wrap_CommandEvent_GetExtraLong(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -11801,12 +12532,17 @@ static PyObject *_wrap_CommandEvent_SetInt(PyObject *self, PyObject *args, PyObj wxCommandEvent *arg1 = (wxCommandEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CommandEvent_SetInt",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetInt",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInt(arg2); @@ -11839,7 +12575,7 @@ static PyObject *_wrap_CommandEvent_GetInt(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -11883,11 +12619,25 @@ static PyObject *_wrap_new_NotifyEvent(PyObject *self, PyObject *args, PyObject wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxNotifyEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_NotifyEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_NotifyEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNotifyEvent *)new wxNotifyEvent(arg1,arg2); @@ -11968,7 +12718,7 @@ static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11989,11 +12739,39 @@ static PyObject *_wrap_new_ScrollEvent(PyObject *self, PyObject *args, PyObject int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxScrollEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid",(char *) "pos",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_ScrollEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ScrollEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxScrollEvent *)new wxScrollEvent(arg1,arg2,arg3,arg4); @@ -12026,7 +12804,7 @@ static PyObject *_wrap_ScrollEvent_GetOrientation(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12051,7 +12829,7 @@ static PyObject *_wrap_ScrollEvent_GetPosition(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12063,12 +12841,17 @@ static PyObject *_wrap_ScrollEvent_SetOrientation(PyObject *self, PyObject *args wxScrollEvent *arg1 = (wxScrollEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -12088,12 +12871,17 @@ static PyObject *_wrap_ScrollEvent_SetPosition(PyObject *self, PyObject *args, P wxScrollEvent *arg1 = (wxScrollEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -12121,11 +12909,32 @@ static PyObject *_wrap_new_ScrollWinEvent(PyObject *self, PyObject *args, PyObje int arg2 = (int) 0 ; int arg3 = (int) 0 ; wxScrollWinEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "pos",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iii:new_ScrollWinEvent",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ScrollWinEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxScrollWinEvent *)new wxScrollWinEvent(arg1,arg2,arg3); @@ -12158,7 +12967,7 @@ static PyObject *_wrap_ScrollWinEvent_GetOrientation(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12183,7 +12992,7 @@ static PyObject *_wrap_ScrollWinEvent_GetPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12195,12 +13004,17 @@ static PyObject *_wrap_ScrollWinEvent_SetOrientation(PyObject *self, PyObject *a wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollWinEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollWinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -12220,12 +13034,17 @@ static PyObject *_wrap_ScrollWinEvent_SetPosition(PyObject *self, PyObject *args wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollWinEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollWinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -12251,11 +13070,18 @@ static PyObject *_wrap_new_MouseEvent(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxMouseEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mouseType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_MouseEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MouseEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMouseEvent *)new wxMouseEvent(arg1); @@ -12290,7 +13116,7 @@ static PyObject *_wrap_MouseEvent_IsButton(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12303,12 +13129,19 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonDown",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonDown(arg2); @@ -12316,7 +13149,7 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12329,12 +13162,19 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonDClick",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonDClick",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonDClick(arg2); @@ -12342,7 +13182,7 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12355,12 +13195,19 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonUp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonUp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonUp(arg2); @@ -12368,7 +13215,7 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12381,12 +13228,17 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_Button",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_Button",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->Button(arg2); @@ -12394,7 +13246,7 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12407,12 +13259,17 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_ButtonIsDown",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_ButtonIsDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonIsDown(arg2); @@ -12420,7 +13277,7 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12445,7 +13302,7 @@ static PyObject *_wrap_MouseEvent_GetButton(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12470,7 +13327,7 @@ static PyObject *_wrap_MouseEvent_ControlDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12495,7 +13352,7 @@ static PyObject *_wrap_MouseEvent_MetaDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12520,7 +13377,7 @@ static PyObject *_wrap_MouseEvent_AltDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12545,7 +13402,7 @@ static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12570,7 +13427,7 @@ static PyObject *_wrap_MouseEvent_LeftDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12595,7 +13452,7 @@ static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12620,7 +13477,7 @@ static PyObject *_wrap_MouseEvent_RightDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12645,7 +13502,7 @@ static PyObject *_wrap_MouseEvent_LeftUp(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12670,7 +13527,7 @@ static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12695,7 +13552,7 @@ static PyObject *_wrap_MouseEvent_RightUp(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12720,7 +13577,7 @@ static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12745,7 +13602,7 @@ static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12770,7 +13627,7 @@ static PyObject *_wrap_MouseEvent_RightDClick(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12795,7 +13652,7 @@ static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12820,7 +13677,7 @@ static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12845,7 +13702,7 @@ static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12870,7 +13727,7 @@ static PyObject *_wrap_MouseEvent_Dragging(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12895,7 +13752,7 @@ static PyObject *_wrap_MouseEvent_Moving(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12920,7 +13777,7 @@ static PyObject *_wrap_MouseEvent_Entering(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12945,7 +13802,7 @@ static PyObject *_wrap_MouseEvent_Leaving(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13072,7 +13929,7 @@ static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13097,7 +13954,7 @@ static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13122,7 +13979,7 @@ static PyObject *_wrap_MouseEvent_GetWheelRotation(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13147,7 +14004,7 @@ static PyObject *_wrap_MouseEvent_GetWheelDelta(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13172,7 +14029,7 @@ static PyObject *_wrap_MouseEvent_GetLinesPerAction(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13197,7 +14054,7 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13209,12 +14066,17 @@ static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObje wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13237,7 +14099,7 @@ static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13249,12 +14111,17 @@ static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObje wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13277,7 +14144,7 @@ static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13297,7 +14164,7 @@ static PyObject *_wrap_MouseEvent_m_leftDown_set(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_leftDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_leftDown = arg2; @@ -13322,7 +14189,7 @@ static PyObject *_wrap_MouseEvent_m_leftDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_leftDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13342,7 +14209,7 @@ static PyObject *_wrap_MouseEvent_m_middleDown_set(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_middleDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_middleDown = arg2; @@ -13367,7 +14234,7 @@ static PyObject *_wrap_MouseEvent_m_middleDown_get(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_middleDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13387,7 +14254,7 @@ static PyObject *_wrap_MouseEvent_m_rightDown_set(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_rightDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_rightDown = arg2; @@ -13412,7 +14279,7 @@ static PyObject *_wrap_MouseEvent_m_rightDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_rightDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13432,7 +14299,7 @@ static PyObject *_wrap_MouseEvent_m_controlDown_set(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_controlDown = arg2; @@ -13457,7 +14324,7 @@ static PyObject *_wrap_MouseEvent_m_controlDown_get(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_controlDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13477,7 +14344,7 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_set(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_shiftDown = arg2; @@ -13502,7 +14369,7 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_shiftDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13522,7 +14389,7 @@ static PyObject *_wrap_MouseEvent_m_altDown_set(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_altDown = arg2; @@ -13547,7 +14414,7 @@ static PyObject *_wrap_MouseEvent_m_altDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_altDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13567,7 +14434,7 @@ static PyObject *_wrap_MouseEvent_m_metaDown_set(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_metaDown = arg2; @@ -13592,7 +14459,7 @@ static PyObject *_wrap_MouseEvent_m_metaDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_metaDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13604,12 +14471,17 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_set(PyObject *self, PyObject * wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_wheelRotation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_wheelRotation_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelRotation_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_wheelRotation = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13632,7 +14504,7 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_get(PyObject *self, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_wheelRotation); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13644,12 +14516,17 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_set(PyObject *self, PyObject *arg wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_wheelDelta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_wheelDelta_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelDelta_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_wheelDelta = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13672,7 +14549,7 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_get(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_wheelDelta); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13684,12 +14561,17 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_set(PyObject *self, PyObject wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_linesPerAction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_linesPerAction_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_linesPerAction_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_linesPerAction = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13712,7 +14594,7 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_linesPerAction); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13731,11 +14613,25 @@ static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObje int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxSetCursorEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SetCursorEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SetCursorEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSetCursorEvent *)new wxSetCursorEvent(arg1,arg2); @@ -13768,7 +14664,7 @@ static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13793,7 +14689,7 @@ static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13876,7 +14772,7 @@ static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13894,11 +14790,18 @@ static PyObject *_wrap_new_KeyEvent(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxKeyEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "keyType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_KeyEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_KeyEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxKeyEvent *)new wxKeyEvent(arg1); @@ -13931,7 +14834,7 @@ static PyObject *_wrap_KeyEvent_ControlDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13956,7 +14859,7 @@ static PyObject *_wrap_KeyEvent_MetaDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13981,7 +14884,7 @@ static PyObject *_wrap_KeyEvent_AltDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14006,7 +14909,7 @@ static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14031,7 +14934,7 @@ static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14056,7 +14959,7 @@ static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14081,7 +14984,7 @@ static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14106,7 +15009,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14131,7 +15034,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14223,7 +15126,7 @@ static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14248,7 +15151,7 @@ static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14260,12 +15163,17 @@ static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:KeyEvent_m_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14288,7 +15196,7 @@ static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14300,12 +15208,17 @@ static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:KeyEvent_m_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14328,7 +15241,7 @@ static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14340,12 +15253,17 @@ static PyObject *_wrap_KeyEvent_m_keyCode_set(PyObject *self, PyObject *args, Py wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_keyCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:KeyEvent_m_keyCode_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_keyCode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_keyCode = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14368,7 +15286,7 @@ static PyObject *_wrap_KeyEvent_m_keyCode_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_keyCode); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -14388,7 +15306,7 @@ static PyObject *_wrap_KeyEvent_m_controlDown_set(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_controlDown = arg2; @@ -14413,7 +15331,7 @@ static PyObject *_wrap_KeyEvent_m_controlDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_controlDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14433,7 +15351,7 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_set(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_shiftDown = arg2; @@ -14458,7 +15376,7 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_shiftDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14478,7 +15396,7 @@ static PyObject *_wrap_KeyEvent_m_altDown_set(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_altDown = arg2; @@ -14503,7 +15421,7 @@ static PyObject *_wrap_KeyEvent_m_altDown_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_altDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14523,7 +15441,7 @@ static PyObject *_wrap_KeyEvent_m_metaDown_set(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_metaDown = arg2; @@ -14548,7 +15466,7 @@ static PyObject *_wrap_KeyEvent_m_metaDown_get(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_metaDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14568,7 +15486,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_set(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_scanCode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_scanCode = arg2; @@ -14593,7 +15511,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_scanCode); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14613,7 +15531,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawCode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_rawCode = arg2; @@ -14638,7 +15556,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (unsigned int) ((arg1)->m_rawCode); - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14658,7 +15576,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawFlags_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_rawFlags = arg2; @@ -14683,7 +15601,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (unsigned int) ((arg1)->m_rawFlags); - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14705,17 +15623,24 @@ static PyObject *_wrap_new_SizeEvent(PyObject *self, PyObject *args, PyObject *k wxSizeEvent *result; wxSize temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "sz",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_SizeEvent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SizeEvent",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = &temp1; if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizeEvent *)new wxSizeEvent((wxSize const &)*arg1,arg2); @@ -14945,17 +15870,24 @@ static PyObject *_wrap_new_MoveEvent(PyObject *self, PyObject *args, PyObject *k wxMoveEvent *result; wxPoint temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "pos",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_MoveEvent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MoveEvent",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = &temp1; if ( ! wxPoint_helper(obj0, &arg1)) SWIG_fail; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMoveEvent *)new wxMoveEvent((wxPoint const &)*arg1,arg2); @@ -15181,11 +16113,18 @@ static PyObject *_wrap_new_PaintEvent(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 = (int) 0 ; wxPaintEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_PaintEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaintEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPaintEvent *)new wxPaintEvent(arg1); @@ -15211,11 +16150,18 @@ static PyObject *_wrap_new_NcPaintEvent(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 = (int) 0 ; wxNcPaintEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_NcPaintEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_NcPaintEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNcPaintEvent *)new wxNcPaintEvent(arg1); @@ -15242,12 +16188,19 @@ static PyObject *_wrap_new_EraseEvent(PyObject *self, PyObject *args, PyObject * int arg1 = (int) 0 ; wxDC *arg2 = (wxDC *) (wxDC *) NULL ; wxEraseEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "Id",(char *) "dc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_EraseEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_EraseEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -15304,11 +16257,25 @@ static PyObject *_wrap_new_FocusEvent(PyObject *self, PyObject *args, PyObject * wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxFocusEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_FocusEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FocusEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFocusEvent *)new wxFocusEvent(arg1,arg2); @@ -15451,15 +16418,29 @@ static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObjec bool arg2 = (bool) True ; int arg3 = (int) 0 ; wxActivateEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "active",(char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iOi:new_ActivateEvent",kwnames,&arg1,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ActivateEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -15495,7 +16476,7 @@ static PyObject *_wrap_ActivateEvent_GetActive(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15513,11 +16494,18 @@ static PyObject *_wrap_new_InitDialogEvent(PyObject *self, PyObject *args, PyObj PyObject *resultobj; int arg1 = (int) 0 ; wxInitDialogEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_InitDialogEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_InitDialogEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxInitDialogEvent *)new wxInitDialogEvent(arg1); @@ -15545,12 +16533,26 @@ static PyObject *_wrap_new_MenuEvent(PyObject *self, PyObject *args, PyObject *k int arg2 = (int) 0 ; wxMenu *arg3 = (wxMenu *) NULL ; wxMenuEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid",(char *) "menu", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_MenuEvent",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_MenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -15586,7 +16588,7 @@ static PyObject *_wrap_MenuEvent_GetMenuId(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15611,7 +16613,7 @@ static PyObject *_wrap_MenuEvent_IsPopup(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15657,11 +16659,25 @@ static PyObject *_wrap_new_CloseEvent(PyObject *self, PyObject *args, PyObject * wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxCloseEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_CloseEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CloseEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCloseEvent *)new wxCloseEvent(arg1,arg2); @@ -15689,7 +16705,7 @@ static PyObject *_wrap_CloseEvent_SetLoggingOff(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetLoggingOff",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15724,7 +16740,7 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15745,7 +16761,7 @@ static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -15776,7 +16792,7 @@ static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15811,7 +16827,7 @@ static PyObject *_wrap_CloseEvent_CanVeto(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15836,7 +16852,7 @@ static PyObject *_wrap_CloseEvent_GetVeto(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15855,15 +16871,22 @@ static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *k int arg1 = (int) 0 ; bool arg2 = (bool) False ; wxShowEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "show", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_ShowEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_ShowEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -15894,7 +16917,7 @@ static PyObject *_wrap_ShowEvent_SetShow(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShowEvent_SetShow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShowEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15929,7 +16952,7 @@ static PyObject *_wrap_ShowEvent_GetShow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15948,15 +16971,22 @@ static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject int arg1 = (int) 0 ; bool arg2 = (bool) True ; wxIconizeEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "iconized", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_IconizeEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconizeEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -15992,7 +17022,7 @@ static PyObject *_wrap_IconizeEvent_Iconized(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16010,11 +17040,18 @@ static PyObject *_wrap_new_MaximizeEvent(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; int arg1 = (int) 0 ; wxMaximizeEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_MaximizeEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MaximizeEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMaximizeEvent *)new wxMaximizeEvent(arg1); @@ -16083,7 +17120,7 @@ static PyObject *_wrap_DropFilesEvent_GetNumberOfFiles(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16126,11 +17163,18 @@ static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; int arg1 = (int) 0 ; wxUpdateUIEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "commandId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_UpdateUIEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_UpdateUIEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxUpdateUIEvent *)new wxUpdateUIEvent(arg1); @@ -16163,7 +17207,7 @@ static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16188,7 +17232,7 @@ static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16244,7 +17288,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16269,7 +17313,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16294,7 +17338,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16314,7 +17358,7 @@ static PyObject *_wrap_UpdateUIEvent_Check(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Check",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16344,7 +17388,7 @@ static PyObject *_wrap_UpdateUIEvent_Enable(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Enable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16404,11 +17448,16 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO static PyObject *_wrap_UpdateUIEvent_SetUpdateInterval(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "updateInterval", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:UpdateUIEvent_SetUpdateInterval",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetUpdateInterval",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxUpdateUIEvent::SetUpdateInterval(arg1); @@ -16438,7 +17487,7 @@ static PyObject *_wrap_UpdateUIEvent_GetUpdateInterval(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16463,7 +17512,7 @@ static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16494,11 +17543,16 @@ static PyObject *_wrap_UpdateUIEvent_ResetUpdateTime(PyObject *self, PyObject *a static PyObject *_wrap_UpdateUIEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:UpdateUIEvent_SetMode",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetMode",kwnames,&obj0)) goto fail; + { + arg1 = (wxUpdateUIMode) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxUpdateUIEvent::SetMode((wxUpdateUIMode )arg1); @@ -16528,7 +17582,7 @@ static PyObject *_wrap_UpdateUIEvent_GetMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16576,12 +17630,19 @@ static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *ar int arg1 = (int) 0 ; wxWindow *arg2 = (wxWindow *) NULL ; wxMouseCaptureChangedEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "gainedCapture", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_MouseCaptureChangedEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MouseCaptureChangedEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -16666,11 +17727,18 @@ static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, P PyObject *resultobj; int arg1 = (int) 0 ; wxPaletteChangedEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_PaletteChangedEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaletteChangedEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPaletteChangedEvent *)new wxPaletteChangedEvent(arg1); @@ -16750,11 +17818,18 @@ static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 = (int) 0 ; wxQueryNewPaletteEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_QueryNewPaletteEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryNewPaletteEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxQueryNewPaletteEvent *)new wxQueryNewPaletteEvent(arg1); @@ -16782,7 +17857,7 @@ static PyObject *_wrap_QueryNewPaletteEvent_SetPaletteRealized(PyObject *self, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryNewPaletteEvent_SetPaletteRealized",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryNewPaletteEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16817,7 +17892,7 @@ static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16871,7 +17946,7 @@ static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16891,7 +17966,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16926,7 +18001,7 @@ static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16946,7 +18021,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17154,12 +18229,26 @@ static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyOb wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxContextMenuEvent *result; wxPoint temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_ContextMenuEvent",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ContextMenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -17282,7 +18371,7 @@ static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIdleEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -17318,7 +18407,7 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17328,11 +18417,16 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P static PyObject *_wrap_IdleEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:IdleEvent_SetMode",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_SetMode",kwnames,&obj0)) goto fail; + { + arg1 = (wxIdleMode) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxIdleEvent::SetMode((wxIdleMode )arg1); @@ -17362,7 +18456,7 @@ static PyObject *_wrap_IdleEvent_GetMode(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17387,7 +18481,7 @@ static PyObject *_wrap_IdleEvent_CanSend(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17406,11 +18500,25 @@ static PyObject *_wrap_new_PyEvent(PyObject *self, PyObject *args, PyObject *kwa int arg1 = (int) 0 ; wxEventType arg2 = (wxEventType) wxEVT_NULL ; wxPyEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "commandType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_PyEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyEvent *)new wxPyEvent(arg1,arg2); @@ -17513,11 +18621,25 @@ static PyObject *_wrap_new_PyCommandEvent(PyObject *self, PyObject *args, PyObje wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxPyCommandEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_PyCommandEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyCommandEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyCommandEvent *)new wxPyCommandEvent(arg1,arg2); @@ -17973,7 +19095,7 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -17984,7 +19106,7 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18033,7 +19155,7 @@ static PyObject *_wrap_PyApp_MainLoop(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18106,7 +19228,7 @@ static PyObject *_wrap_PyApp_Pending(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18131,7 +19253,7 @@ static PyObject *_wrap_PyApp_Dispatch(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18156,7 +19278,7 @@ static PyObject *_wrap_PyApp_ProcessIdle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18190,7 +19312,7 @@ static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18215,7 +19337,7 @@ static PyObject *_wrap_PyApp_IsActive(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18289,7 +19411,7 @@ static PyObject *_wrap_PyApp_SetExitOnFrameDelete(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetExitOnFrameDelete",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18324,7 +19446,7 @@ static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18344,7 +19466,7 @@ static PyObject *_wrap_PyApp_SetUseBestVisual(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetUseBestVisual",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18379,7 +19501,7 @@ static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18391,12 +19513,17 @@ static PyObject *_wrap_PyApp_SetPrintMode(PyObject *self, PyObject *args, PyObje wxPyApp *arg1 = (wxPyApp *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyApp_SetPrintMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetPrintMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrintMode(arg2); @@ -18429,7 +19556,7 @@ static PyObject *_wrap_PyApp_GetPrintMode(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18441,12 +19568,17 @@ static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObj wxPyApp *arg1 = (wxPyApp *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyApp_SetAssertMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetAssertMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAssertMode(arg2); @@ -18479,7 +19611,7 @@ static PyObject *_wrap_PyApp_GetAssertMode(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18501,7 +19633,7 @@ static PyObject *_wrap_PyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18523,7 +19655,7 @@ static PyObject *_wrap_PyApp_GetMacAboutMenuItemId(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18545,7 +19677,7 @@ static PyObject *_wrap_PyApp_GetMacPreferencesMenuItemId(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18567,7 +19699,7 @@ static PyObject *_wrap_PyApp_GetMacExitMenuItemId(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18612,7 +19744,7 @@ static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacSupportPCMenuShortcuts",kwnames,&obj0)) goto fail; { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -18632,11 +19764,16 @@ static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObje static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacAboutMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacAboutMenuItemId",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacAboutMenuItemId(arg1); @@ -18654,11 +19791,16 @@ static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *arg static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacPreferencesMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacPreferencesMenuItemId",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacPreferencesMenuItemId(arg1); @@ -18676,11 +19818,16 @@ static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObjec static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacExitMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacExitMenuItemId",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacExitMenuItemId(arg1); @@ -18771,7 +19918,7 @@ static PyObject *_wrap_PyApp_GetComCtl32Version(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18821,7 +19968,7 @@ static PyObject *_wrap_Yield(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18843,7 +19990,7 @@ static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18867,7 +20014,7 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -18878,7 +20025,7 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18988,12 +20135,33 @@ static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyOb int arg3 = (int) 0 ; wxMenuItem *arg4 = (wxMenuItem *) NULL ; wxAcceleratorEntry *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiiO:new_AcceleratorEntry",kwnames,&arg1,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_AcceleratorEntry",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -19043,13 +20211,28 @@ static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyOb int arg4 ; wxMenuItem *arg5 = (wxMenuItem *) NULL ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii|O:AcceleratorEntry_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:AcceleratorEntry_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -19139,7 +20322,7 @@ static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19164,7 +20347,7 @@ static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19189,7 +20372,7 @@ static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19281,7 +20464,7 @@ static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19295,7 +20478,7 @@ static PyObject * AcceleratorTable_swigregister(PyObject *self, PyObject *args) Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_NullAcceleratorTable_set(PyObject *_val) { +static int _wrap_NullAcceleratorTable_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only."); return 1; } @@ -19347,7 +20530,7 @@ static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObje } -static int _wrap_PanelNameStr_set(PyObject *_val) { +static int _wrap_PanelNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable PanelNameStr is read-only."); return 1; } @@ -19383,15 +20566,21 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar 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 *)"Oi|OOlO:new_Window",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Window",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -19404,6 +20593,12 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -19477,16 +20672,22 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Window_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -19499,6 +20700,12 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -19513,7 +20720,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -19543,7 +20750,7 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -19554,7 +20761,7 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19579,7 +20786,7 @@ static PyObject *_wrap_Window_Destroy(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19604,7 +20811,7 @@ static PyObject *_wrap_Window_DestroyChildren(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19629,7 +20836,7 @@ static PyObject *_wrap_Window_IsBeingDeleted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19854,12 +21061,17 @@ static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kw wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -19892,7 +21104,7 @@ static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19914,7 +21126,7 @@ static PyObject *_wrap_Window_NewControlId(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19925,11 +21137,16 @@ static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyOb PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Window_NextControlId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_NextControlId",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxWindow::NextControlId(arg1); @@ -19937,7 +21154,7 @@ static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19948,11 +21165,16 @@ static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyOb PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Window_PrevControlId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PrevControlId",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxWindow::PrevControlId(arg1); @@ -19960,7 +21182,7 @@ static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20007,12 +21229,39 @@ static PyObject *_wrap_Window_SetDimensions(PyObject *self, PyObject *args, PyOb int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:Window_SetDimensions",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetDimensions",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3,arg4,arg5,arg6); @@ -20035,16 +21284,23 @@ static PyObject *_wrap_Window_SetRect(PyObject *self, PyObject *args, PyObject * wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rect",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Window_SetRect",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize((wxRect const &)*arg2,arg3); @@ -20065,12 +21321,22 @@ static PyObject *_wrap_Window_SetSizeWH(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_SetSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -20093,16 +21359,23 @@ static PyObject *_wrap_Window_Move(PyObject *self, PyObject *args, PyObject *kwa wxPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Window_Move",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_Move",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Move((wxPoint const &)*arg2,arg3); @@ -20124,12 +21397,29 @@ static PyObject *_wrap_Window_MoveXY(PyObject *self, PyObject *args, PyObject *k int arg3 ; int arg4 = (int) wxSIZE_USE_EXISTING ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:Window_MoveXY",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_MoveXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Move(arg2,arg3,arg4); @@ -20229,12 +21519,22 @@ static PyObject *_wrap_Window_SetClientSizeWH(PyObject *self, PyObject *args, Py int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_SetClientSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetClientSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetClientSize(arg2,arg3); @@ -20669,12 +21969,19 @@ static PyObject *_wrap_Window_Center(PyObject *self, PyObject *args, PyObject *k wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_Center",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Center",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Center(arg2); @@ -20694,12 +22001,19 @@ static PyObject *_wrap_Window_CenterOnScreen(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_CenterOnScreen",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_CenterOnScreen",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CenterOnScreen(arg2); @@ -20719,12 +22033,19 @@ static PyObject *_wrap_Window_CenterOnParent(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_CenterOnParent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_CenterOnParent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CenterOnParent(arg2); @@ -20797,12 +22118,50 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj int arg6 = (int) -1 ; int arg7 = (int) -1 ; 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 *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH",(char *) "incW",(char *) "incH", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiii:Window_SetSizeHints",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_SetSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSizeHints(arg2,arg3,arg4,arg5,arg6,arg7); @@ -20825,12 +22184,36 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args int arg4 = (int) -1 ; int arg5 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|ii:Window_SetVirtualSizeHints",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_SetVirtualSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVirtualSizeHints(arg2,arg3,arg4,arg5); @@ -20863,7 +22246,7 @@ static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20888,7 +22271,7 @@ static PyObject *_wrap_Window_GetMinHeight(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20913,7 +22296,7 @@ static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20938,7 +22321,7 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21011,12 +22394,22 @@ static PyObject *_wrap_Window_SetVirtualSizeWH(PyObject *self, PyObject *args, P int arg2 ; int 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 *)"Oii:Window_SetVirtualSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetVirtualSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVirtualSize(arg2,arg3); @@ -21142,7 +22535,7 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -21153,7 +22546,7 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21178,7 +22571,7 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21200,7 +22593,7 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -21211,7 +22604,7 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21236,7 +22629,7 @@ static PyObject *_wrap_Window_Disable(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21261,7 +22654,7 @@ static PyObject *_wrap_Window_IsShown(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21286,7 +22679,7 @@ static PyObject *_wrap_Window_IsEnabled(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21298,12 +22691,17 @@ static PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *self, PyObject *args, wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetWindowStyleFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindowStyleFlag(arg2); @@ -21336,7 +22734,7 @@ static PyObject *_wrap_Window_GetWindowStyleFlag(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21348,12 +22746,17 @@ static PyObject *_wrap_Window_SetWindowStyle(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetWindowStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindowStyle(arg2); @@ -21386,7 +22789,7 @@ static PyObject *_wrap_Window_GetWindowStyle(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21399,12 +22802,17 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_HasFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->HasFlag(arg2); @@ -21412,7 +22820,7 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21437,7 +22845,7 @@ static PyObject *_wrap_Window_IsRetained(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21449,12 +22857,17 @@ static PyObject *_wrap_Window_SetExtraStyle(PyObject *self, PyObject *args, PyOb wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "exStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetExtraStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetExtraStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraStyle(arg2); @@ -21487,7 +22900,7 @@ static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21508,7 +22921,7 @@ static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -21539,7 +22952,7 @@ static PyObject *_wrap_Window_SetThemeEnabled(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetThemeEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -21574,7 +22987,7 @@ static PyObject *_wrap_Window_GetThemeEnabled(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21599,7 +23012,7 @@ static PyObject *_wrap_Window_ShouldInheritColours(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21696,7 +23109,7 @@ static PyObject *_wrap_Window_AcceptsFocus(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21721,7 +23134,7 @@ static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21909,7 +23322,7 @@ static PyObject *_wrap_Window_IsTopLevel(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21937,7 +23350,7 @@ static PyObject *_wrap_Window_Reparent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22004,12 +23417,17 @@ static PyObject *_wrap_Window_FindWindowById(PyObject *self, PyObject *args, PyO long arg2 ; wxWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_FindWindowById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FindWindowById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->FindWindow(arg2); @@ -22165,7 +23583,7 @@ static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -22206,7 +23624,7 @@ static PyObject *_wrap_Window_RemoveEventHandler(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22333,12 +23751,27 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO int arg4 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hotkeyId",(char *) "modifiers",(char *) "keycode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:Window_RegisterHotKey",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_RegisterHotKey",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxWindow_RegisterHotKey(arg1,arg2,arg3,arg4); @@ -22346,7 +23779,7 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22359,12 +23792,17 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hotkeyId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_UnregisterHotKey",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_UnregisterHotKey",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxWindow_UnregisterHotKey(arg1,arg2); @@ -22372,7 +23810,7 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22601,12 +24039,22 @@ static PyObject *_wrap_Window_WarpPointer(PyObject *self, PyObject *args, PyObje int arg2 ; int 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 *)"Oii:Window_WarpPointer",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_WarpPointer",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->WarpPointer(arg2,arg3); @@ -22711,7 +24159,7 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22734,7 +24182,7 @@ static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -22978,12 +24426,36 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject int arg5 = (int) 1 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|ii:Window_IsExposed",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_IsExposed",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->IsExposed(arg2,arg3,arg4,arg5); @@ -22991,7 +24463,7 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23023,7 +24495,7 @@ static PyObject *_wrap_Window_IsExposedPoint(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23055,7 +24527,7 @@ static PyObject *_wrap_Window_isExposedRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23087,7 +24559,7 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23119,7 +24591,7 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23208,7 +24680,7 @@ static PyObject *_wrap_Window_SetCursor(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23267,7 +24739,7 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23372,7 +24844,7 @@ static PyObject *_wrap_Window_GetCharHeight(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23397,7 +24869,7 @@ static PyObject *_wrap_Window_GetCharWidth(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23706,12 +25178,22 @@ static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject int 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 *)"Oii:Window_HitTestXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->HitTest(arg2,arg3); @@ -23719,7 +25201,7 @@ static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23751,7 +25233,7 @@ static PyObject *_wrap_Window_HitTest(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23764,12 +25246,17 @@ static PyObject *_wrap_Window_GetBorderFlags(PyObject *self, PyObject *args, PyO long arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_GetBorderFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetBorderFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetBorder(arg2); @@ -23777,7 +25264,7 @@ static PyObject *_wrap_Window_GetBorderFlags(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23802,7 +25289,7 @@ static PyObject *_wrap_Window_GetBorder(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23814,12 +25301,19 @@ static PyObject *_wrap_Window_UpdateWindowUI(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; long arg2 = (long) wxUPDATE_UI_NONE ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Window_UpdateWindowUI",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_UpdateWindowUI",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->UpdateWindowUI(arg2); @@ -23843,13 +25337,23 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "menu",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:Window_PopupMenuXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_PopupMenuXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->PopupMenu(arg2,arg3,arg4); @@ -23857,7 +25361,7 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23892,7 +25396,7 @@ static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23917,7 +25421,7 @@ static PyObject *_wrap_Window_GetHandle(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -23930,12 +25434,17 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_HasScrollbar",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasScrollbar",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->HasScrollbar(arg2); @@ -23943,7 +25452,7 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23959,16 +25468,36 @@ static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObj int arg5 ; bool arg6 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient",(char *) "pos",(char *) "thumbvisible",(char *) "range",(char *) "refresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|O:Window_SetScrollbar",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -23993,16 +25522,26 @@ static PyObject *_wrap_Window_SetScrollPos(PyObject *self, PyObject *args, PyObj int arg3 ; bool arg4 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient",(char *) "pos",(char *) "refresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Window_SetScrollPos",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_SetScrollPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -24026,12 +25565,17 @@ static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollPos",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollPos",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollPos(arg2); @@ -24039,7 +25583,7 @@ static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24052,12 +25596,17 @@ static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyO int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollThumb",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollThumb",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollThumb(arg2); @@ -24065,7 +25614,7 @@ static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24078,12 +25627,17 @@ static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyO int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollRange",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollRange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollRange(arg2); @@ -24091,7 +25645,7 @@ static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24105,13 +25659,23 @@ static PyObject *_wrap_Window_ScrollWindow(PyObject *self, PyObject *args, PyObj int arg3 ; wxRect *arg4 = (wxRect *) NULL ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Window_ScrollWindow",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_ScrollWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -24135,12 +25699,17 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lines", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_ScrollLines",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollLines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollLines(arg2); @@ -24148,7 +25717,7 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24161,12 +25730,17 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pages", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_ScrollPages",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollPages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollPages(arg2); @@ -24174,7 +25748,7 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24199,7 +25773,7 @@ static PyObject *_wrap_Window_LineUp(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24224,7 +25798,7 @@ static PyObject *_wrap_Window_LineDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24249,7 +25823,7 @@ static PyObject *_wrap_Window_PageUp(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24274,7 +25848,7 @@ static PyObject *_wrap_Window_PageDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24603,7 +26177,7 @@ static PyObject *_wrap_Window_SetAutoLayout(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetAutoLayout",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -24638,7 +26212,7 @@ static PyObject *_wrap_Window_GetAutoLayout(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24663,7 +26237,7 @@ static PyObject *_wrap_Window_Layout(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24687,7 +26261,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -24722,7 +26296,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -24833,12 +26407,17 @@ static PyObject *_wrap_FindWindowById(PyObject *self, PyObject *args, PyObject * long arg1 ; wxWindow *arg2 = (wxWindow *) NULL ; wxWindow *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "parent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l|O:FindWindowById",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FindWindowById",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -24959,7 +26538,7 @@ static PyObject *_wrap_Window_FromHWND(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_FromHWND",kwnames,&obj0)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -25050,7 +26629,7 @@ static PyObject *_wrap_Validator_Validate(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25075,7 +26654,7 @@ static PyObject *_wrap_Validator_TransferToWindow(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25100,7 +26679,7 @@ static PyObject *_wrap_Validator_TransferFromWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25176,7 +26755,7 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25186,11 +26765,18 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Validator_SetBellOnError(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) True ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "doIt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:Validator_SetBellOnError",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Validator_SetBellOnError",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxValidator::SetBellOnError(arg1); @@ -25243,14 +26829,21 @@ static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *self, PyObject *ar PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:PyValidator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyValidator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->_setCallbackInfo(arg2,arg3,arg4); @@ -25272,7 +26865,7 @@ static PyObject * PyValidator_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_DefaultValidator_set(PyObject *_val) { +static int _wrap_DefaultValidator_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DefaultValidator is read-only."); return 1; } @@ -25294,11 +26887,12 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs wxMenu *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Ol:new_Menu",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Menu",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -25306,6 +26900,12 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs temp1 = True; } } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenu *)new wxMenu((wxString const &)*arg1,arg2); @@ -25342,14 +26942,20 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Append",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25362,6 +26968,12 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa temp4 = True; } } + if (obj4) { + { + arg5 = (wxItemKind) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Append(arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxItemKind )arg5); @@ -25432,14 +27044,19 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25495,14 +27112,19 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25559,6 +27181,7 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject bool temp3 = False ; bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -25566,8 +27189,12 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_AppendMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_AppendMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25683,7 +27310,7 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -25717,16 +27344,22 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|Oi:Menu_Insert",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Menu_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -25741,6 +27374,12 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa temp5 = True; } } + if (obj5) { + { + arg6 = (wxItemKind) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Insert(arg2,arg3,(wxString const &)*arg4,(wxString const &)*arg5,(wxItemKind )arg6); @@ -25787,7 +27426,7 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_InsertSeparator",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -25819,16 +27458,21 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -25888,16 +27532,21 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -25958,6 +27607,7 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject bool temp6 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; @@ -25965,10 +27615,14 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -26058,14 +27712,20 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Prepend",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26078,6 +27738,12 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw temp4 = True; } } + if (obj4) { + { + arg5 = (wxItemKind) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Prepend(arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxItemKind )arg5); @@ -26148,14 +27814,19 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26211,14 +27882,19 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26275,6 +27951,7 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject bool temp3 = False ; bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -26282,8 +27959,12 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_PrependMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_PrependMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26335,12 +28016,17 @@ static PyObject *_wrap_Menu_Remove(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Remove",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Remove",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Remove(arg2); @@ -26393,12 +28079,17 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Delete",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Delete",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Delete(arg2); @@ -26406,7 +28097,7 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26434,7 +28125,7 @@ static PyObject *_wrap_Menu_DeleteItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26471,12 +28162,17 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_DestroyId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DestroyId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Destroy(arg2); @@ -26484,7 +28180,7 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26512,7 +28208,7 @@ static PyObject *_wrap_Menu_DestroyItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26537,7 +28233,7 @@ static PyObject *_wrap_Menu_GetMenuItemCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -26595,7 +28291,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -26616,12 +28312,17 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *self, PyObject *args, PyObjec int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_FindItemById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)((wxMenu const *)arg1)->FindItem(arg2); @@ -26652,7 +28353,7 @@ static PyObject *_wrap_Menu_FindItemByPosition(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemByPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -26677,15 +28378,20 @@ static PyObject *_wrap_Menu_Enable(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -26708,12 +28414,17 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsEnabled",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenu const *)arg1)->IsEnabled(arg2); @@ -26721,7 +28432,7 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26734,15 +28445,20 @@ static PyObject *_wrap_Menu_Check(PyObject *self, PyObject *args, PyObject *kwar int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "check", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Check",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -26765,12 +28481,17 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsChecked",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsChecked",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenu const *)arg1)->IsChecked(arg2); @@ -26778,7 +28499,7 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26792,13 +28513,18 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26832,12 +28558,17 @@ static PyObject *_wrap_Menu_GetLabel(PyObject *self, PyObject *args, PyObject *k int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetLabel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetLabel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenu const *)arg1)->GetLabel(arg2); @@ -26865,13 +28596,18 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26905,12 +28641,17 @@ static PyObject *_wrap_Menu_GetHelpString(PyObject *self, PyObject *args, PyObje int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetHelpString",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetHelpString",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenu const *)arg1)->GetHelpString(arg2); @@ -27128,7 +28869,7 @@ static PyObject *_wrap_Menu_GetStyle(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -27260,7 +29001,7 @@ static PyObject *_wrap_Menu_IsAttached(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -27332,11 +29073,18 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa PyObject *resultobj; long arg1 = (long) 0 ; wxMenuBar *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|l:new_MenuBar",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MenuBar",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuBar *)new wxMenuBar(arg1); @@ -27382,7 +29130,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -27416,7 +29164,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -27432,7 +29180,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -27465,7 +29213,7 @@ static PyObject *_wrap_MenuBar_GetMenuCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -27486,7 +29234,7 @@ static PyObject *_wrap_MenuBar_GetMenu(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetMenu",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27524,7 +29272,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -27571,7 +29319,7 @@ static PyObject *_wrap_MenuBar_Remove(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_Remove",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27605,11 +29353,11 @@ static PyObject *_wrap_MenuBar_EnableTop(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_EnableTop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -27640,7 +29388,7 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabledTop",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27650,7 +29398,7 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -27673,7 +29421,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabelTop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27717,7 +29465,7 @@ static PyObject *_wrap_MenuBar_GetLabelTop(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabelTop",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27774,7 +29522,7 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -27803,12 +29551,17 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *self, PyObject *args, PyOb int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_FindItemById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_FindItemById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)((wxMenuBar const *)arg1)->FindItem(arg2); @@ -27851,7 +29604,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -27872,15 +29625,20 @@ static PyObject *_wrap_MenuBar_Enable(PyObject *self, PyObject *args, PyObject * int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -27903,15 +29661,20 @@ static PyObject *_wrap_MenuBar_Check(PyObject *self, PyObject *args, PyObject *k int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "check", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Check",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -27934,12 +29697,17 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsChecked",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsChecked",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuBar const *)arg1)->IsChecked(arg2); @@ -27947,7 +29715,7 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -27960,12 +29728,17 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsEnabled",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuBar const *)arg1)->IsEnabled(arg2); @@ -27973,7 +29746,7 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -27987,13 +29760,18 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -28027,12 +29805,17 @@ static PyObject *_wrap_MenuBar_GetLabel(PyObject *self, PyObject *args, PyObject int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetLabel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenuBar const *)arg1)->GetLabel(arg2); @@ -28060,13 +29843,18 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -28100,12 +29888,17 @@ static PyObject *_wrap_MenuBar_GetHelpString(PyObject *self, PyObject *args, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetHelpString",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetHelpString",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenuBar const *)arg1)->GetHelpString(arg2); @@ -28171,7 +29964,7 @@ static PyObject *_wrap_MenuBar_IsAttached(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28250,17 +30043,25 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parentMenu",(char *) "id",(char *) "text",(char *) "help",(char *) "kind",(char *) "subMenu", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiOOiO:new_MenuItem",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_MenuItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if (obj0) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -28275,6 +30076,12 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw temp4 = True; } } + if (obj4) { + { + arg5 = (wxItemKind) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -28369,12 +30176,17 @@ static PyObject *_wrap_MenuItem_SetId(PyObject *self, PyObject *args, PyObject * wxMenuItem *arg1 = (wxMenuItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuItem_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -28407,7 +30219,7 @@ static PyObject *_wrap_MenuItem_GetId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -28432,7 +30244,7 @@ static PyObject *_wrap_MenuItem_IsSeparator(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28606,7 +30418,7 @@ static PyObject *_wrap_MenuItem_GetKind(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -28626,7 +30438,7 @@ static PyObject *_wrap_MenuItem_SetCheckable(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetCheckable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -28661,7 +30473,7 @@ static PyObject *_wrap_MenuItem_IsCheckable(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28686,7 +30498,7 @@ static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28761,7 +30573,7 @@ static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -28797,7 +30609,7 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28818,7 +30630,7 @@ static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -28854,7 +30666,7 @@ static PyObject *_wrap_MenuItem_IsChecked(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -29026,7 +30838,7 @@ static PyObject *_wrap_MenuItem_GetDefaultMarginWidth(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -29098,7 +30910,7 @@ static PyObject * MenuItem_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ControlNameStr_set(PyObject *_val) { +static int _wrap_ControlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ControlNameStr is read-only."); return 1; } @@ -29136,16 +30948,22 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlOO:new_Control",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:new_Control",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -29158,6 +30976,12 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -29239,17 +31063,23 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlOO:Control_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:Control_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -29262,6 +31092,12 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -29282,7 +31118,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -29436,7 +31272,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -29512,18 +31348,23 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|O:ItemContainer_Insert",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ItemContainer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { arg4 = obj3; } @@ -29534,7 +31375,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -29578,12 +31419,17 @@ static PyObject *_wrap_ItemContainer_Delete(PyObject *self, PyObject *args, PyOb wxItemContainer *arg1 = (wxItemContainer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_Delete",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Delete",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Delete(arg2); @@ -29616,7 +31462,7 @@ static PyObject *_wrap_ItemContainer_GetCount(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -29641,7 +31487,7 @@ static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -29654,12 +31500,17 @@ static PyObject *_wrap_ItemContainer_GetString(PyObject *self, PyObject *args, P int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_GetString",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetString",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxItemContainer const *)arg1)->GetString(arg2); @@ -29714,13 +31565,18 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ItemContainer_SetString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -29774,7 +31630,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -29794,12 +31650,17 @@ static PyObject *_wrap_ItemContainer_Select(PyObject *self, PyObject *args, PyOb wxItemContainer *arg1 = (wxItemContainer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_Select",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Select",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Select(arg2); @@ -29832,7 +31693,7 @@ static PyObject *_wrap_ItemContainer_GetSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -29876,12 +31737,17 @@ static PyObject *_wrap_ItemContainer_GetClientData(PyObject *self, PyObject *arg int arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_GetClientData",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetClientData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxItemContainer_GetClientData(arg1,arg2); @@ -29902,13 +31768,18 @@ static PyObject *_wrap_ItemContainer_SetClientData(PyObject *self, PyObject *arg int arg2 ; PyObject *arg3 = (PyObject *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ItemContainer_SetClientData",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetClientData",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29969,12 +31840,37 @@ static PyObject *_wrap_new_SizerItemSpacer(PyObject *self, PyObject *args, PyObj int arg5 ; wxObject *arg6 = (wxObject *) 0 ; wxSizerItem *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiiiiO:new_SizerItemSpacer",kwnames,&arg1,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_SizerItemSpacer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29999,13 +31895,28 @@ static PyObject *_wrap_new_SizerItemWindow(PyObject *self, PyObject *args, PyObj wxObject *arg5 = (wxObject *) 0 ; wxSizerItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "window",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:new_SizerItemWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_SizerItemWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30030,13 +31941,28 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *self, PyObject *args, PyObje wxObject *arg5 = (wxObject *) 0 ; wxSizerItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "sizer",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:new_SizerItemSizer",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_SizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30227,12 +32153,22 @@ static PyObject *_wrap_SizerItem_SetInitSize(PyObject *self, PyObject *args, PyO int arg2 ; int 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 *)"Oii:SizerItem_SetInitSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetInitSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInitSize(arg2,arg3); @@ -30253,12 +32189,22 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:SizerItem_SetRatioWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetRatioWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRatio(arg2,arg3); @@ -30307,12 +32253,17 @@ static PyObject *_wrap_SizerItem_SetRatio(PyObject *self, PyObject *args, PyObje wxSizerItem *arg1 = (wxSizerItem *) 0 ; float arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ratio", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Of:SizerItem_SetRatio",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetRatio",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (float) SWIG_PyObj_AsFloat(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRatio(arg2); @@ -30345,7 +32296,7 @@ static PyObject *_wrap_SizerItem_GetRatio(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromFloat((float)result); return resultobj; fail: return NULL; @@ -30370,7 +32321,7 @@ static PyObject *_wrap_SizerItem_IsWindow(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -30395,7 +32346,7 @@ static PyObject *_wrap_SizerItem_IsSizer(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -30420,7 +32371,7 @@ static PyObject *_wrap_SizerItem_IsSpacer(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -30432,12 +32383,17 @@ static PyObject *_wrap_SizerItem_SetProportion(PyObject *self, PyObject *args, P wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetProportion",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetProportion",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetProportion(arg2); @@ -30470,7 +32426,7 @@ static PyObject *_wrap_SizerItem_GetProportion(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -30482,12 +32438,17 @@ static PyObject *_wrap_SizerItem_SetFlag(PyObject *self, PyObject *args, PyObjec wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlag(arg2); @@ -30520,7 +32481,7 @@ static PyObject *_wrap_SizerItem_GetFlag(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -30532,12 +32493,17 @@ static PyObject *_wrap_SizerItem_SetBorder(PyObject *self, PyObject *args, PyObj wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorder(arg2); @@ -30570,7 +32536,7 @@ static PyObject *_wrap_SizerItem_GetBorder(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -30757,7 +32723,7 @@ static PyObject *_wrap_SizerItem_Show(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_Show",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -30792,7 +32758,7 @@ static PyObject *_wrap_SizerItem_IsShown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -30897,14 +32863,35 @@ static PyObject *_wrap_Sizer_Add(PyObject *self, PyObject *args, PyObject *kwarg PyObject *arg6 = (PyObject *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiiO:Sizer_Add",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Sizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { arg6 = obj5; } @@ -30932,15 +32919,41 @@ static PyObject *_wrap_Sizer_Insert(PyObject *self, PyObject *args, PyObject *kw int arg6 = (int) 0 ; PyObject *arg7 = (PyObject *) NULL ; 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 *) "before",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|iiiO:Sizer_Insert",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Sizer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } arg3 = obj2; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { arg7 = obj6; } @@ -30968,14 +32981,35 @@ static PyObject *_wrap_Sizer_Prepend(PyObject *self, PyObject *args, PyObject *k PyObject *arg6 = (PyObject *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiiO:Sizer_Prepend",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Sizer_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { arg6 = obj5; } @@ -31014,7 +33048,7 @@ static PyObject *_wrap_Sizer_Remove(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -31097,7 +33131,7 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -31150,12 +33184,32 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Sizer_SetDimension",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Sizer_SetDimension",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDimension(arg2,arg3,arg4,arg5); @@ -31492,7 +33546,7 @@ static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -31576,7 +33630,7 @@ static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwar arg2 = obj1; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -31642,7 +33696,7 @@ static PyObject *_wrap_Sizer_IsShown(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -31662,7 +33716,7 @@ static PyObject *_wrap_Sizer_ShowItems(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_ShowItems",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -31749,11 +33803,18 @@ static PyObject *_wrap_new_BoxSizer(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; int arg1 = (int) wxHORIZONTAL ; wxBoxSizer *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_BoxSizer",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_BoxSizer",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBoxSizer *)new wxBoxSizer(arg1); @@ -31786,7 +33847,7 @@ static PyObject *_wrap_BoxSizer_GetOrientation(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -31798,12 +33859,17 @@ static PyObject *_wrap_BoxSizer_SetOrientation(PyObject *self, PyObject *args, P wxBoxSizer *arg1 = (wxBoxSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:BoxSizer_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BoxSizer_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -31884,12 +33950,19 @@ static PyObject *_wrap_new_StaticBoxSizer(PyObject *self, PyObject *args, PyObje int arg2 = (int) wxHORIZONTAL ; wxStaticBoxSizer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "box",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_StaticBoxSizer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_StaticBoxSizer",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxStaticBoxSizer *)new wxStaticBoxSizer(arg1,arg2); @@ -31998,11 +34071,39 @@ static PyObject *_wrap_new_GridSizer(PyObject *self, PyObject *args, PyObject *k int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxGridSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "rows",(char *) "cols",(char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_GridSizer",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_GridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridSizer *)new wxGridSizer(arg1,arg2,arg3,arg4); @@ -32075,12 +34176,17 @@ static PyObject *_wrap_GridSizer_SetCols(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetCols",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetCols",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCols(arg2); @@ -32100,12 +34206,17 @@ static PyObject *_wrap_GridSizer_SetRows(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetRows",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetRows",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRows(arg2); @@ -32125,12 +34236,17 @@ static PyObject *_wrap_GridSizer_SetVGap(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "gap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetVGap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetVGap",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVGap(arg2); @@ -32150,12 +34266,17 @@ static PyObject *_wrap_GridSizer_SetHGap(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "gap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetHGap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetHGap",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHGap(arg2); @@ -32188,7 +34309,7 @@ static PyObject *_wrap_GridSizer_GetCols(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32213,7 +34334,7 @@ static PyObject *_wrap_GridSizer_GetRows(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32238,7 +34359,7 @@ static PyObject *_wrap_GridSizer_GetVGap(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32263,7 +34384,7 @@ static PyObject *_wrap_GridSizer_GetHGap(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32284,11 +34405,39 @@ static PyObject *_wrap_new_FlexGridSizer(PyObject *self, PyObject *args, PyObjec int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxFlexGridSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "rows",(char *) "cols",(char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_FlexGridSizer",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_FlexGridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFlexGridSizer *)new wxFlexGridSizer(arg1,arg2,arg3,arg4); @@ -32363,16 +34512,23 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableRow(PyObject *self, PyObject *ar int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "idx",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddGrowableRow(arg2,arg3); @@ -32400,7 +34556,7 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableRow(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -32424,16 +34580,23 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableCol(PyObject *self, PyObject *ar int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "idx",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddGrowableCol(arg2,arg3); @@ -32461,7 +34624,7 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableCol(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -32483,12 +34646,17 @@ static PyObject *_wrap_FlexGridSizer_SetFlexibleDirection(PyObject *self, PyObje wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlexibleDirection(arg2); @@ -32521,7 +34689,7 @@ static PyObject *_wrap_FlexGridSizer_GetFlexibleDirection(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32533,12 +34701,17 @@ static PyObject *_wrap_FlexGridSizer_SetNonFlexibleGrowMode(PyObject *self, PyOb wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFlexSizerGrowMode) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNonFlexibleGrowMode((wxFlexSizerGrowMode )arg2); @@ -32571,7 +34744,7 @@ static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32662,11 +34835,25 @@ static PyObject *_wrap_new_GBPosition(PyObject *self, PyObject *args, PyObject * int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxGBPosition *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GBPosition",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBPosition",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBPosition *)new wxGBPosition(arg1,arg2); @@ -32699,7 +34886,7 @@ static PyObject *_wrap_GBPosition_GetRow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32724,7 +34911,7 @@ static PyObject *_wrap_GBPosition_GetCol(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32736,12 +34923,17 @@ static PyObject *_wrap_GBPosition_SetRow(PyObject *self, PyObject *args, PyObjec wxGBPosition *arg1 = (wxGBPosition *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBPosition_SetRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRow(arg2); @@ -32761,12 +34953,17 @@ static PyObject *_wrap_GBPosition_SetCol(PyObject *self, PyObject *args, PyObjec wxGBPosition *arg1 = (wxGBPosition *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBPosition_SetCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCol(arg2); @@ -32806,7 +35003,7 @@ static PyObject *_wrap_GBPosition___eq__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -32838,7 +35035,7 @@ static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -32851,12 +35048,26 @@ static PyObject *_wrap_GBPosition_Set(PyObject *self, PyObject *args, PyObject * int arg2 = (int) 0 ; int arg3 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:GBPosition_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GBPosition_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGBPosition_Set(arg1,arg2,arg3); @@ -32908,11 +35119,25 @@ static PyObject *_wrap_new_GBSpan(PyObject *self, PyObject *args, PyObject *kwar int arg1 = (int) 1 ; int arg2 = (int) 1 ; wxGBSpan *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "rowspan",(char *) "colspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GBSpan",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBSpan",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSpan *)new wxGBSpan(arg1,arg2); @@ -32945,7 +35170,7 @@ static PyObject *_wrap_GBSpan_GetRowspan(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32970,7 +35195,7 @@ static PyObject *_wrap_GBSpan_GetColspan(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32982,12 +35207,17 @@ static PyObject *_wrap_GBSpan_SetRowspan(PyObject *self, PyObject *args, PyObjec wxGBSpan *arg1 = (wxGBSpan *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rowspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBSpan_SetRowspan",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetRowspan",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowspan(arg2); @@ -33007,12 +35237,17 @@ static PyObject *_wrap_GBSpan_SetColspan(PyObject *self, PyObject *args, PyObjec wxGBSpan *arg1 = (wxGBSpan *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "colspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBSpan_SetColspan",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetColspan",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColspan(arg2); @@ -33052,7 +35287,7 @@ static PyObject *_wrap_GBSpan___eq__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33084,7 +35319,7 @@ static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33097,12 +35332,26 @@ static PyObject *_wrap_GBSpan_Set(PyObject *self, PyObject *args, PyObject *kwar int arg2 = (int) 1 ; int arg3 = (int) 1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rowspan",(char *) "colspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:GBSpan_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GBSpan_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGBSpan_Set(arg1,arg2,arg3); @@ -33149,7 +35398,7 @@ static PyObject * GBSpan_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_DefaultSpan_set(PyObject *_val) { +static int _wrap_DefaultSpan_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DefaultSpan is read-only."); return 1; } @@ -33199,12 +35448,14 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "window",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiiO:new_GBSizerItemWindow",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GBSizerItemWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -33214,6 +35465,14 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO arg3 = &temp3; if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33243,12 +35502,14 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "sizer",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiiO:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -33258,6 +35519,14 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb arg3 = &temp3; if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33285,14 +35554,26 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO wxGBSizerItem *result; wxGBPosition temp3 ; wxGBSpan temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiOOiiO:new_GBSizerItemSpacer",kwnames,&arg1,&arg2,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:new_GBSizerItemSpacer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxGBPosition_helper(obj2, &arg3)) SWIG_fail; @@ -33301,6 +35582,14 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO arg4 = &temp4; if ( ! wxGBSpan_helper(obj3, &arg4)) SWIG_fail; } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33399,7 +35688,7 @@ static PyObject *_wrap_GBSizerItem_SetPos(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33431,7 +35720,7 @@ static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33459,7 +35748,7 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_0(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33495,7 +35784,7 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_1(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33668,11 +35957,25 @@ static PyObject *_wrap_new_GridBagSizer(PyObject *self, PyObject *args, PyObject int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxGridBagSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridBagSizer",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridBagSizer",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridBagSizer *)new wxGridBagSizer(arg1,arg2); @@ -33704,12 +36007,14 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OiiO:GridBagSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:GridBagSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; { @@ -33722,6 +36027,18 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject if ( ! wxGBSpan_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { arg7 = obj6; } @@ -33732,7 +36049,7 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33760,7 +36077,7 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33896,7 +36213,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_2(PyObject *self, PyOb if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -33991,7 +36308,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar } if (_v) { { - SPyObj_AsUnsignedInt(argv[1]); + SWIG_PyObj_AsUnsignedLong(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -34035,7 +36352,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34067,7 +36384,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34088,7 +36405,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyOb if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -34102,7 +36419,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34193,7 +36510,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar } if (_v) { { - SPyObj_AsUnsignedInt(argv[1]); + SWIG_PyObj_AsUnsignedLong(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -34286,7 +36603,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_2(PyObject *self, PyObject if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -34381,7 +36698,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) } if (_v) { { - SPyObj_AsUnsignedInt(argv[1]); + SWIG_PyObj_AsUnsignedLong(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -34425,7 +36742,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34457,7 +36774,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34478,7 +36795,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -34492,7 +36809,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34583,7 +36900,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) } if (_v) { { - SPyObj_AsUnsignedInt(argv[1]); + SWIG_PyObj_AsUnsignedLong(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -34892,7 +37209,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_0(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34933,7 +37250,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_1(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -35050,14 +37367,38 @@ static PyObject *_wrap_IndividualLayoutConstraint_Set(PyObject *self, PyObject * int arg5 = (int) 0 ; int arg6 = (int) wxLAYOUT_DEFAULT_MARGIN ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rel",(char *) "otherW",(char *) "otherE",(char *) "val",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOi|ii:IndividualLayoutConstraint_Set",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:IndividualLayoutConstraint_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxRelationship) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (wxEdge) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set((wxRelationship )arg2,arg3,(wxEdge )arg4,arg5,arg6); @@ -35079,13 +37420,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_LeftOf(PyObject *self, PyObjec int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_LeftOf",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_LeftOf",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->LeftOf(arg2,arg3); @@ -35107,13 +37455,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_RightOf(PyObject *self, PyObje int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_RightOf",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_RightOf",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RightOf(arg2,arg3); @@ -35135,13 +37490,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_Above(PyObject *self, PyObject int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_Above",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_Above",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Above(arg2,arg3); @@ -35163,13 +37525,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_Below(PyObject *self, PyObject int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_Below",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_Below",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Below(arg2,arg3); @@ -35192,13 +37561,25 @@ static PyObject *_wrap_IndividualLayoutConstraint_SameAs(PyObject *self, PyObjec int arg4 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "otherW",(char *) "edge",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|i:IndividualLayoutConstraint_SameAs",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:IndividualLayoutConstraint_SameAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (wxEdge) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SameAs(arg2,(wxEdge )arg3,arg4); @@ -35221,13 +37602,23 @@ static PyObject *_wrap_IndividualLayoutConstraint_PercentOf(PyObject *self, PyOb int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "otherW",(char *) "wh",(char *) "per", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:IndividualLayoutConstraint_PercentOf",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_PercentOf",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (wxEdge) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PercentOf(arg2,(wxEdge )arg3,arg4); @@ -35247,12 +37638,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_Absolute(PyObject *self, PyObj wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_Absolute",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_Absolute",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Absolute(arg2); @@ -35360,7 +37756,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMyEdge(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35372,12 +37768,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetEdge(PyObject *self, PyObje wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetEdge",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetEdge",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxEdge) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEdge((wxEdge )arg2); @@ -35397,12 +37798,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetValue(PyObject *self, PyObj wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -35435,7 +37841,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMargin(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35447,12 +37853,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetMargin(PyObject *self, PyOb wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetMargin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetMargin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargin(arg2); @@ -35485,7 +37896,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetValue(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35510,7 +37921,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetPercent(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35535,7 +37946,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetOtherEdge(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35560,7 +37971,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -35580,7 +37991,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetDone(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetDone",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -35615,7 +38026,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetRelationship(PyObject *self wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35627,12 +38038,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetRelationship(PyObject *self wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "r", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxRelationship) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRelationship((wxRelationship )arg2); @@ -35668,7 +38084,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -35699,7 +38115,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -35714,14 +38130,19 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObje wxWindow *arg4 = (wxWindow *) 0 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "which",(char *) "thisWin",(char *) "other", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:IndividualLayoutConstraint_GetEdge",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_GetEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxEdge) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -35731,7 +38152,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35951,7 +38372,7 @@ static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -35980,7 +38401,7 @@ static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -37741,11 +40162,11 @@ static swig_type_info _swigt__p_wxAppTraits[] = {{"_p_wxAppTraits", 0, "wxAppTra static swig_type_info _swigt__p_wxArrayString[] = {{"_p_wxArrayString", 0, "wxArrayString *", 0},{"_p_wxArrayString"},{0}}; static swig_type_info _swigt__p_wxShowEvent[] = {{"_p_wxShowEvent", 0, "wxShowEvent *", 0},{"_p_wxShowEvent"},{0}}; static swig_type_info _swigt__p_wxToolTip[] = {{"_p_wxToolTip", 0, "wxToolTip *", 0},{"_p_wxToolTip"},{0}}; -static swig_type_info _swigt__p_wxMaximizeEvent[] = {{"_p_wxMaximizeEvent", 0, "wxMaximizeEvent *", 0},{"_p_wxMaximizeEvent"},{0}}; static swig_type_info _swigt__p_wxIconizeEvent[] = {{"_p_wxIconizeEvent", 0, "wxIconizeEvent *", 0},{"_p_wxIconizeEvent"},{0}}; static swig_type_info _swigt__p_wxActivateEvent[] = {{"_p_wxActivateEvent", 0, "wxActivateEvent *", 0},{"_p_wxActivateEvent"},{0}}; static swig_type_info _swigt__p_wxMoveEvent[] = {{"_p_wxMoveEvent", 0, "wxMoveEvent *", 0},{"_p_wxMoveEvent"},{0}}; static swig_type_info _swigt__p_wxSizeEvent[] = {{"_p_wxSizeEvent", 0, "wxSizeEvent *", 0},{"_p_wxSizeEvent"},{0}}; +static swig_type_info _swigt__p_wxMaximizeEvent[] = {{"_p_wxMaximizeEvent", 0, "wxMaximizeEvent *", 0},{"_p_wxMaximizeEvent"},{0}}; static swig_type_info _swigt__p_wxQueryNewPaletteEvent[] = {{"_p_wxQueryNewPaletteEvent", 0, "wxQueryNewPaletteEvent *", 0},{"_p_wxQueryNewPaletteEvent"},{0}}; static swig_type_info _swigt__p_wxWindowCreateEvent[] = {{"_p_wxWindowCreateEvent", 0, "wxWindowCreateEvent *", 0},{"_p_wxWindowCreateEvent"},{0}}; static swig_type_info _swigt__p_wxIdleEvent[] = {{"_p_wxIdleEvent", 0, "wxIdleEvent *", 0},{"_p_wxIdleEvent"},{0}}; @@ -37761,6 +40182,7 @@ static swig_type_info _swigt__p_wxGIFHandler[] = {{"_p_wxGIFHandler", 0, "wxGIFH static swig_type_info _swigt__p_wxPNGHandler[] = {{"_p_wxPNGHandler", 0, "wxPNGHandler *", 0},{"_p_wxPNGHandler"},{0}}; static swig_type_info _swigt__p_wxANIHandler[] = {{"_p_wxANIHandler", 0, "wxANIHandler *", 0},{"_p_wxANIHandler"},{0}}; static swig_type_info _swigt__p_wxMemoryFSHandler[] = {{"_p_wxMemoryFSHandler", 0, "wxMemoryFSHandler *", 0},{"_p_wxMemoryFSHandler"},{0}}; +static swig_type_info _swigt__p_wxZipFSHandler[] = {{"_p_wxZipFSHandler", 0, "wxZipFSHandler *", 0},{"_p_wxZipFSHandler"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxCURHandler[] = {{"_p_wxCURHandler", 0, "wxCURHandler *", 0},{"_p_wxCURHandler"},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxCURHandler},{0}}; static swig_type_info _swigt__p_wxICOHandler[] = {{"_p_wxICOHandler", 0, "wxICOHandler *", 0},{"_p_wxICOHandler"},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxICOHandler},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxICOHandler},{0}}; @@ -37769,11 +40191,11 @@ static swig_type_info _swigt__p_wxImageHandler[] = {{"_p_wxImageHandler", 0, "wx static swig_type_info _swigt__p_wxFileSystemHandler[] = {{"_p_wxFileSystemHandler", 0, "wxFileSystemHandler *", 0},{"_p_wxFileSystemHandler"},{"_p_wxPyFileSystemHandler", _p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler},{"_p_wxInternetFSHandler", _p_wxInternetFSHandlerTo_p_wxFileSystemHandler},{"_p_wxZipFSHandler", _p_wxZipFSHandlerTo_p_wxFileSystemHandler},{"_p_wxMemoryFSHandler", _p_wxMemoryFSHandlerTo_p_wxFileSystemHandler},{0}}; static swig_type_info _swigt__p_wxPyFileSystemHandler[] = {{"_p_wxPyFileSystemHandler", 0, "wxPyFileSystemHandler *", 0},{"_p_wxPyFileSystemHandler"},{0}}; static swig_type_info _swigt__p_wxInternetFSHandler[] = {{"_p_wxInternetFSHandler", 0, "wxInternetFSHandler *", 0},{"_p_wxInternetFSHandler"},{0}}; -static swig_type_info _swigt__p_wxZipFSHandler[] = {{"_p_wxZipFSHandler", 0, "wxZipFSHandler *", 0},{"_p_wxZipFSHandler"},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; static swig_type_info _swigt__p_wxGBSpan[] = {{"_p_wxGBSpan", 0, "wxGBSpan *", 0},{"_p_wxGBSpan"},{0}}; static swig_type_info _swigt__p_wxPropagateOnce[] = {{"_p_wxPropagateOnce", 0, "wxPropagateOnce *", 0},{"_p_wxPropagateOnce"},{0}}; static swig_type_info _swigt__p_wxAcceleratorTable[] = {{"_p_wxAcceleratorTable", 0, "wxAcceleratorTable *", 0},{"_p_wxAcceleratorTable"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxGBPosition[] = {{"_p_wxGBPosition", 0, "wxGBPosition *", 0},{"_p_wxGBPosition"},{0}}; static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0},{"_p_wxImage"},{0}}; static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxFrame"},{0}}; @@ -37857,11 +40279,11 @@ _swigt__p_wxAppTraits, _swigt__p_wxArrayString, _swigt__p_wxShowEvent, _swigt__p_wxToolTip, -_swigt__p_wxMaximizeEvent, _swigt__p_wxIconizeEvent, _swigt__p_wxActivateEvent, _swigt__p_wxMoveEvent, _swigt__p_wxSizeEvent, +_swigt__p_wxMaximizeEvent, _swigt__p_wxQueryNewPaletteEvent, _swigt__p_wxWindowCreateEvent, _swigt__p_wxIdleEvent, @@ -37877,6 +40299,7 @@ _swigt__p_wxGIFHandler, _swigt__p_wxPNGHandler, _swigt__p_wxANIHandler, _swigt__p_wxMemoryFSHandler, +_swigt__p_wxZipFSHandler, _swigt__p_wxEvtHandler, _swigt__p_wxCURHandler, _swigt__p_wxICOHandler, @@ -37885,11 +40308,11 @@ _swigt__p_wxImageHandler, _swigt__p_wxFileSystemHandler, _swigt__p_wxPyFileSystemHandler, _swigt__p_wxInternetFSHandler, -_swigt__p_wxZipFSHandler, _swigt__p_wxRect, _swigt__p_wxGBSpan, _swigt__p_wxPropagateOnce, _swigt__p_wxAcceleratorTable, +_swigt__p_char, _swigt__p_wxGBPosition, _swigt__p_wxImage, _swigt__p_wxFrame, @@ -37935,762 +40358,6 @@ _swigt__p_wxPyValidator, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"NOT_FOUND", (long) wxNOT_FOUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VSCROLL", (long) wxVSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HSCROLL", (long) wxHSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAPTION", (long) wxCAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOUBLE_BORDER", (long) wxDOUBLE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SUNKEN_BORDER", (long) wxSUNKEN_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RAISED_BORDER", (long) wxRAISED_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER", (long) wxBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIMPLE_BORDER", (long) wxSIMPLE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STATIC_BORDER", (long) wxSTATIC_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TRANSPARENT_WINDOW", (long) wxTRANSPARENT_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_BORDER", (long) wxNO_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"USER_COLOURS", (long) wxUSER_COLOURS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_3D", (long) wxNO_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TAB_TRAVERSAL", (long) wxTAB_TRAVERSAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WANTS_CHARS", (long) wxWANTS_CHARS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"POPUP_WINDOW", (long) wxPOPUP_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER_FRAME", (long) wxCENTER_FRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTRE_ON_SCREEN", (long) wxCENTRE_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER_ON_SCREEN", (long) wxCENTER_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STAY_ON_TOP", (long) wxSTAY_ON_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICONIZE", (long) wxICONIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MINIMIZE", (long) wxMINIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAXIMIZE", (long) wxMAXIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLOSE_BOX", (long) wxCLOSE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"THICK_FRAME", (long) wxTHICK_FRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYSTEM_MENU", (long) wxSYSTEM_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MINIMIZE_BOX", (long) wxMINIMIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAXIMIZE_BOX", (long) wxMAXIMIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TINY_CAPTION_HORIZ", (long) wxTINY_CAPTION_HORIZ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TINY_CAPTION_VERT", (long) wxTINY_CAPTION_VERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESIZE_BOX", (long) wxRESIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESIZE_BORDER", (long) wxRESIZE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_MODAL", (long) wxDIALOG_MODAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_MODELESS", (long) wxDIALOG_MODELESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_NO_PARENT", (long) wxDIALOG_NO_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT_FRAME_STYLE", (long) wxDEFAULT_FRAME_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT_DIALOG_STYLE", (long) wxDEFAULT_DIALOG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_TOOL_WINDOW", (long) wxFRAME_TOOL_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_FLOAT_ON_PARENT", (long) wxFRAME_FLOAT_ON_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_NO_WINDOW_MENU", (long) wxFRAME_NO_WINDOW_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_NO_TASKBAR", (long) wxFRAME_NO_TASKBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_SHAPED", (long) wxFRAME_SHAPED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_CLIENT_MARGIN", (long) wxED_CLIENT_MARGIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_BUTTONS_BOTTOM", (long) wxED_BUTTONS_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_BUTTONS_RIGHT", (long) wxED_BUTTONS_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_STATIC_LINE", (long) wxED_STATIC_LINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXT_DIALOG_STYLE", (long) wxEXT_DIALOG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLIP_CHILDREN", (long) wxCLIP_CHILDREN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLIP_SIBLINGS", (long) wxCLIP_SIBLINGS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RETAINED", (long) wxRETAINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BACKINGSTORE", (long) wxBACKINGSTORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"COLOURED", (long) wxCOLOURED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIXED_LENGTH", (long) wxFIXED_LENGTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_NEEDED_SB", (long) wxLB_NEEDED_SB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_ALWAYS_SB", (long) wxLB_ALWAYS_SB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_SORT", (long) wxLB_SORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_SINGLE", (long) wxLB_SINGLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_MULTIPLE", (long) wxLB_MULTIPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_EXTENDED", (long) wxLB_EXTENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_OWNERDRAW", (long) wxLB_OWNERDRAW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_HSCROLL", (long) wxLB_HSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PROCESS_ENTER", (long) wxPROCESS_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PASSWORD", (long) wxPASSWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_SIMPLE", (long) wxCB_SIMPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_DROPDOWN", (long) wxCB_DROPDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_SORT", (long) wxCB_SORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_READONLY", (long) wxCB_READONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_HORIZONTAL", (long) wxRA_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_VERTICAL", (long) wxRA_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_SPECIFY_ROWS", (long) wxRA_SPECIFY_ROWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_SPECIFY_COLS", (long) wxRA_SPECIFY_COLS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RB_GROUP", (long) wxRB_GROUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RB_SINGLE", (long) wxRB_SINGLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_HORIZONTAL", (long) wxSL_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_VERTICAL", (long) wxSL_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_AUTOTICKS", (long) wxSL_AUTOTICKS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_LABELS", (long) wxSL_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_LEFT", (long) wxSL_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_TOP", (long) wxSL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_RIGHT", (long) wxSL_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_BOTTOM", (long) wxSL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_BOTH", (long) wxSL_BOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_SELRANGE", (long) wxSL_SELRANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SB_HORIZONTAL", (long) wxSB_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SB_VERTICAL", (long) wxSB_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ST_SIZEGRIP", (long) wxST_SIZEGRIP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ST_NO_AUTORESIZE", (long) wxST_NO_AUTORESIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLOOD_SURFACE", (long) wxFLOOD_SURFACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLOOD_BORDER", (long) wxFLOOD_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ODDEVEN_RULE", (long) wxODDEVEN_RULE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WINDING_RULE", (long) wxWINDING_RULE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_TOP", (long) wxTOOL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_BOTTOM", (long) wxTOOL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_LEFT", (long) wxTOOL_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_RIGHT", (long) wxTOOL_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OK", (long) wxOK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES_NO", (long) wxYES_NO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CANCEL", (long) wxCANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES", (long) wxYES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO", (long) wxNO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_DEFAULT", (long) wxNO_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES_DEFAULT", (long) wxYES_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_EXCLAMATION", (long) wxICON_EXCLAMATION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_HAND", (long) wxICON_HAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_QUESTION", (long) wxICON_QUESTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_INFORMATION", (long) wxICON_INFORMATION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_STOP", (long) wxICON_STOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_ASTERISK", (long) wxICON_ASTERISK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_MASK", (long) wxICON_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_WARNING", (long) wxICON_WARNING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_ERROR", (long) wxICON_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FORWARD", (long) wxFORWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BACKWARD", (long) wxBACKWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESET", (long) wxRESET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HELP", (long) wxHELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MORE", (long) wxMORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SETUP", (long) wxSETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO_WIDTH", (long) wxSIZE_AUTO_WIDTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO_HEIGHT", (long) wxSIZE_AUTO_HEIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO", (long) wxSIZE_AUTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_USE_EXISTING", (long) wxSIZE_USE_EXISTING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_ALLOW_MINUS_ONE", (long) wxSIZE_ALLOW_MINUS_ONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PORTRAIT", (long) wxPORTRAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANDSCAPE", (long) wxLANDSCAPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_HIGH", (long) wxPRINT_QUALITY_HIGH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_MEDIUM", (long) wxPRINT_QUALITY_MEDIUM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_LOW", (long) wxPRINT_QUALITY_LOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_DRAFT", (long) wxPRINT_QUALITY_DRAFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ANY", (long) wxID_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SEPARATOR", (long) wxID_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_LOWEST", (long) wxID_LOWEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_OPEN", (long) wxID_OPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLOSE", (long) wxID_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NEW", (long) wxID_NEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SAVE", (long) wxID_SAVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SAVEAS", (long) wxID_SAVEAS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REVERT", (long) wxID_REVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_EXIT", (long) wxID_EXIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_UNDO", (long) wxID_UNDO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REDO", (long) wxID_REDO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP", (long) wxID_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PRINT", (long) wxID_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PRINT_SETUP", (long) wxID_PRINT_SETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW", (long) wxID_PREVIEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ABOUT", (long) wxID_ABOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_CONTENTS", (long) wxID_HELP_CONTENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_COMMANDS", (long) wxID_HELP_COMMANDS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_PROCEDURES", (long) wxID_HELP_PROCEDURES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_CONTEXT", (long) wxID_HELP_CONTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLOSE_ALL", (long) wxID_CLOSE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREFERENCES", (long) wxID_PREFERENCES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CUT", (long) wxID_CUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_COPY", (long) wxID_COPY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PASTE", (long) wxID_PASTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLEAR", (long) wxID_CLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FIND", (long) wxID_FIND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DUPLICATE", (long) wxID_DUPLICATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SELECTALL", (long) wxID_SELECTALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DELETE", (long) wxID_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REPLACE", (long) wxID_REPLACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REPLACE_ALL", (long) wxID_REPLACE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PROPERTIES", (long) wxID_PROPERTIES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_DETAILS", (long) wxID_VIEW_DETAILS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_LARGEICONS", (long) wxID_VIEW_LARGEICONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SMALLICONS", (long) wxID_VIEW_SMALLICONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_LIST", (long) wxID_VIEW_LIST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTDATE", (long) wxID_VIEW_SORTDATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTNAME", (long) wxID_VIEW_SORTNAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTSIZE", (long) wxID_VIEW_SORTSIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTTYPE", (long) wxID_VIEW_SORTTYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE1", (long) wxID_FILE1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE2", (long) wxID_FILE2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE3", (long) wxID_FILE3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE4", (long) wxID_FILE4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE5", (long) wxID_FILE5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE6", (long) wxID_FILE6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE7", (long) wxID_FILE7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE8", (long) wxID_FILE8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE9", (long) wxID_FILE9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_OK", (long) wxID_OK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CANCEL", (long) wxID_CANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_APPLY", (long) wxID_APPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_YES", (long) wxID_YES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NO", (long) wxID_NO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_STATIC", (long) wxID_STATIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FORWARD", (long) wxID_FORWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_BACKWARD", (long) wxID_BACKWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DEFAULT", (long) wxID_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_MORE", (long) wxID_MORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SETUP", (long) wxID_SETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_RESET", (long) wxID_RESET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CONTEXT_HELP", (long) wxID_CONTEXT_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_YESTOALL", (long) wxID_YESTOALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NOTOALL", (long) wxID_NOTOALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ABORT", (long) wxID_ABORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_RETRY", (long) wxID_RETRY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_IGNORE", (long) wxID_IGNORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HIGHEST", (long) wxID_HIGHEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OPEN", (long) wxOPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SAVE", (long) wxSAVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HIDE_READONLY", (long) wxHIDE_READONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OVERWRITE_PROMPT", (long) wxOVERWRITE_PROMPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FILE_MUST_EXIST", (long) wxFILE_MUST_EXIST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MULTIPLE", (long) wxMULTIPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHANGE_DIR", (long) wxCHANGE_DIR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_ALT", (long) wxACCEL_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_CTRL", (long) wxACCEL_CTRL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_SHIFT", (long) wxACCEL_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_NORMAL", (long) wxACCEL_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_AUTO_HIDE", (long) wxPD_AUTO_HIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_APP_MODAL", (long) wxPD_APP_MODAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_CAN_ABORT", (long) wxPD_CAN_ABORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_ELAPSED_TIME", (long) wxPD_ELAPSED_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_ESTIMATED_TIME", (long) wxPD_ESTIMATED_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_REMAINING_TIME", (long) wxPD_REMAINING_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DD_NEW_DIR_BUTTON", (long) wxDD_NEW_DIR_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DD_DEFAULT_STYLE", (long) wxDD_DEFAULT_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MENU_TEAROFF", (long) wxMENU_TEAROFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MB_DOCKABLE", (long) wxMB_DOCKABLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_FULL_REPAINT_ON_RESIZE", (long) wxNO_FULL_REPAINT_ON_RESIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULL_REPAINT_ON_RESIZE", (long) wxFULL_REPAINT_ON_RESIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LI_HORIZONTAL", (long) wxLI_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LI_VERTICAL", (long) wxLI_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_VALIDATE_RECURSIVELY", (long) wxWS_EX_VALIDATE_RECURSIVELY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_BLOCK_EVENTS", (long) wxWS_EX_BLOCK_EVENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_TRANSIENT", (long) wxWS_EX_TRANSIENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_THEMED_BACKGROUND", (long) wxWS_EX_THEMED_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_PROCESS_IDLE", (long) wxWS_EX_PROCESS_IDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_PROCESS_UI_UPDATES", (long) wxWS_EX_PROCESS_UI_UPDATES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_TEXT", (long) wxMM_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_LOMETRIC", (long) wxMM_LOMETRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_HIMETRIC", (long) wxMM_HIMETRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_LOENGLISH", (long) wxMM_LOENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_HIENGLISH", (long) wxMM_HIENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_TWIPS", (long) wxMM_TWIPS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_ISOTROPIC", (long) wxMM_ISOTROPIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_ANISOTROPIC", (long) wxMM_ANISOTROPIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_POINTS", (long) wxMM_POINTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_METRIC", (long) wxMM_METRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTRE", (long) wxCENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER", (long) wxCENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HORIZONTAL", (long) wxHORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VERTICAL", (long) wxVERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOTH", (long) wxBOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LEFT", (long) wxLEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RIGHT", (long) wxRIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UP", (long) wxUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOWN", (long) wxDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOP", (long) wxTOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOTTOM", (long) wxBOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NORTH", (long) wxNORTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SOUTH", (long) wxSOUTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WEST", (long) wxWEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EAST", (long) wxEAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALL", (long) wxALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_NOT", (long) wxALIGN_NOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER_HORIZONTAL", (long) wxALIGN_CENTER_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE_HORIZONTAL", (long) wxALIGN_CENTRE_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_LEFT", (long) wxALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_TOP", (long) wxALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_RIGHT", (long) wxALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_BOTTOM", (long) wxALIGN_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER_VERTICAL", (long) wxALIGN_CENTER_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE_VERTICAL", (long) wxALIGN_CENTRE_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER", (long) wxALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE", (long) wxALIGN_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_MASK", (long) wxALIGN_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STRETCH_NOT", (long) wxSTRETCH_NOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHRINK", (long) wxSHRINK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GROW", (long) wxGROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXPAND", (long) wxEXPAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHAPED", (long) wxSHAPED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ADJUST_MINSIZE", (long) wxADJUST_MINSIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TILE", (long) wxTILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_DEFAULT", (long) wxBORDER_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_NONE", (long) wxBORDER_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_STATIC", (long) wxBORDER_STATIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_SIMPLE", (long) wxBORDER_SIMPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_RAISED", (long) wxBORDER_RAISED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_SUNKEN", (long) wxBORDER_SUNKEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_DOUBLE", (long) wxBORDER_DOUBLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_MASK", (long) wxBORDER_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT", (long) wxDEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DECORATIVE", (long) wxDECORATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ROMAN", (long) wxROMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SCRIPT", (long) wxSCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SWISS", (long) wxSWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MODERN", (long) wxMODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TELETYPE", (long) wxTELETYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VARIABLE", (long) wxVARIABLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIXED", (long) wxFIXED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NORMAL", (long) wxNORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIGHT", (long) wxLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOLD", (long) wxBOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITALIC", (long) wxITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SLANT", (long) wxSLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SOLID", (long) wxSOLID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOT", (long) wxDOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LONG_DASH", (long) wxLONG_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHORT_DASH", (long) wxSHORT_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOT_DASH", (long) wxDOT_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"USER_DASH", (long) wxUSER_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TRANSPARENT", (long) wxTRANSPARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STIPPLE", (long) wxSTIPPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BDIAGONAL_HATCH", (long) wxBDIAGONAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CROSSDIAG_HATCH", (long) wxCROSSDIAG_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FDIAGONAL_HATCH", (long) wxFDIAGONAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CROSS_HATCH", (long) wxCROSS_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HORIZONTAL_HATCH", (long) wxHORIZONTAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VERTICAL_HATCH", (long) wxVERTICAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_BEVEL", (long) wxJOIN_BEVEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_MITER", (long) wxJOIN_MITER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_ROUND", (long) wxJOIN_ROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_ROUND", (long) wxCAP_ROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_PROJECTING", (long) wxCAP_PROJECTING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_BUTT", (long) wxCAP_BUTT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLEAR", (long) wxCLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"XOR", (long) wxXOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"INVERT", (long) wxINVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR_REVERSE", (long) wxOR_REVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND_REVERSE", (long) wxAND_REVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"COPY", (long) wxCOPY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND", (long) wxAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND_INVERT", (long) wxAND_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_OP", (long) wxNO_OP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NOR", (long) wxNOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EQUIV", (long) wxEQUIV, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SRC_INVERT", (long) wxSRC_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR_INVERT", (long) wxOR_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NAND", (long) wxNAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR", (long) wxOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SET", (long) wxSET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_BACK", (long) WXK_BACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_TAB", (long) WXK_TAB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RETURN", (long) WXK_RETURN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ESCAPE", (long) WXK_ESCAPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SPACE", (long) WXK_SPACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DELETE", (long) WXK_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_START", (long) WXK_START, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_LBUTTON", (long) WXK_LBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RBUTTON", (long) WXK_RBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CANCEL", (long) WXK_CANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MBUTTON", (long) WXK_MBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CLEAR", (long) WXK_CLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SHIFT", (long) WXK_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ALT", (long) WXK_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CONTROL", (long) WXK_CONTROL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MENU", (long) WXK_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAUSE", (long) WXK_PAUSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CAPITAL", (long) WXK_CAPITAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PRIOR", (long) WXK_PRIOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NEXT", (long) WXK_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_END", (long) WXK_END, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_HOME", (long) WXK_HOME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_LEFT", (long) WXK_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_UP", (long) WXK_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RIGHT", (long) WXK_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DOWN", (long) WXK_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SELECT", (long) WXK_SELECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PRINT", (long) WXK_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_EXECUTE", (long) WXK_EXECUTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SNAPSHOT", (long) WXK_SNAPSHOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_INSERT", (long) WXK_INSERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_HELP", (long) WXK_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD0", (long) WXK_NUMPAD0, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD1", (long) WXK_NUMPAD1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD2", (long) WXK_NUMPAD2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD3", (long) WXK_NUMPAD3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD4", (long) WXK_NUMPAD4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD5", (long) WXK_NUMPAD5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD6", (long) WXK_NUMPAD6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD7", (long) WXK_NUMPAD7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD8", (long) WXK_NUMPAD8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD9", (long) WXK_NUMPAD9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MULTIPLY", (long) WXK_MULTIPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ADD", (long) WXK_ADD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SEPARATOR", (long) WXK_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SUBTRACT", (long) WXK_SUBTRACT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DECIMAL", (long) WXK_DECIMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DIVIDE", (long) WXK_DIVIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F1", (long) WXK_F1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F2", (long) WXK_F2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F3", (long) WXK_F3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F4", (long) WXK_F4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F5", (long) WXK_F5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F6", (long) WXK_F6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F7", (long) WXK_F7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F8", (long) WXK_F8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F9", (long) WXK_F9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F10", (long) WXK_F10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F11", (long) WXK_F11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F12", (long) WXK_F12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F13", (long) WXK_F13, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F14", (long) WXK_F14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F15", (long) WXK_F15, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F16", (long) WXK_F16, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F17", (long) WXK_F17, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F18", (long) WXK_F18, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F19", (long) WXK_F19, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F20", (long) WXK_F20, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F21", (long) WXK_F21, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F22", (long) WXK_F22, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F23", (long) WXK_F23, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F24", (long) WXK_F24, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMLOCK", (long) WXK_NUMLOCK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SCROLL", (long) WXK_SCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAGEUP", (long) WXK_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAGEDOWN", (long) WXK_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SPACE", (long) WXK_NUMPAD_SPACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_TAB", (long) WXK_NUMPAD_TAB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_ENTER", (long) WXK_NUMPAD_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F1", (long) WXK_NUMPAD_F1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F2", (long) WXK_NUMPAD_F2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F3", (long) WXK_NUMPAD_F3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F4", (long) WXK_NUMPAD_F4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_HOME", (long) WXK_NUMPAD_HOME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_LEFT", (long) WXK_NUMPAD_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_UP", (long) WXK_NUMPAD_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_RIGHT", (long) WXK_NUMPAD_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DOWN", (long) WXK_NUMPAD_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PRIOR", (long) WXK_NUMPAD_PRIOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PAGEUP", (long) WXK_NUMPAD_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_NEXT", (long) WXK_NUMPAD_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PAGEDOWN", (long) WXK_NUMPAD_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_END", (long) WXK_NUMPAD_END, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_BEGIN", (long) WXK_NUMPAD_BEGIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_INSERT", (long) WXK_NUMPAD_INSERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DELETE", (long) WXK_NUMPAD_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_EQUAL", (long) WXK_NUMPAD_EQUAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_MULTIPLY", (long) WXK_NUMPAD_MULTIPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_ADD", (long) WXK_NUMPAD_ADD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SEPARATOR", (long) WXK_NUMPAD_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SUBTRACT", (long) WXK_NUMPAD_SUBTRACT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DECIMAL", (long) WXK_NUMPAD_DECIMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DIVIDE", (long) WXK_NUMPAD_DIVIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_LEFT", (long) WXK_WINDOWS_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_RIGHT", (long) WXK_WINDOWS_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_MENU", (long) WXK_WINDOWS_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_NONE", (long) wxPAPER_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER", (long) wxPAPER_LETTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEGAL", (long) wxPAPER_LEGAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4", (long) wxPAPER_A4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_CSHEET", (long) wxPAPER_CSHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_DSHEET", (long) wxPAPER_DSHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ESHEET", (long) wxPAPER_ESHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTERSMALL", (long) wxPAPER_LETTERSMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_TABLOID", (long) wxPAPER_TABLOID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEDGER", (long) wxPAPER_LEDGER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_STATEMENT", (long) wxPAPER_STATEMENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_EXECUTIVE", (long) wxPAPER_EXECUTIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3", (long) wxPAPER_A3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4SMALL", (long) wxPAPER_A4SMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5", (long) wxPAPER_A5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B4", (long) wxPAPER_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5", (long) wxPAPER_B5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FOLIO", (long) wxPAPER_FOLIO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_QUARTO", (long) wxPAPER_QUARTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_10X14", (long) wxPAPER_10X14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_11X17", (long) wxPAPER_11X17, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_NOTE", (long) wxPAPER_NOTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_9", (long) wxPAPER_ENV_9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_10", (long) wxPAPER_ENV_10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_11", (long) wxPAPER_ENV_11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_12", (long) wxPAPER_ENV_12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_14", (long) wxPAPER_ENV_14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_DL", (long) wxPAPER_ENV_DL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C5", (long) wxPAPER_ENV_C5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C3", (long) wxPAPER_ENV_C3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C4", (long) wxPAPER_ENV_C4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C6", (long) wxPAPER_ENV_C6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C65", (long) wxPAPER_ENV_C65, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B4", (long) wxPAPER_ENV_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B5", (long) wxPAPER_ENV_B5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B6", (long) wxPAPER_ENV_B6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_ITALY", (long) wxPAPER_ENV_ITALY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_MONARCH", (long) wxPAPER_ENV_MONARCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_PERSONAL", (long) wxPAPER_ENV_PERSONAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_US", (long) wxPAPER_FANFOLD_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_STD_GERMAN", (long) wxPAPER_FANFOLD_STD_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_LGL_GERMAN", (long) wxPAPER_FANFOLD_LGL_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ISO_B4", (long) wxPAPER_ISO_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_JAPANESE_POSTCARD", (long) wxPAPER_JAPANESE_POSTCARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_9X11", (long) wxPAPER_9X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_10X11", (long) wxPAPER_10X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_15X11", (long) wxPAPER_15X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_INVITE", (long) wxPAPER_ENV_INVITE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_EXTRA", (long) wxPAPER_LETTER_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEGAL_EXTRA", (long) wxPAPER_LEGAL_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_TABLOID_EXTRA", (long) wxPAPER_TABLOID_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_EXTRA", (long) wxPAPER_A4_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_TRANSVERSE", (long) wxPAPER_LETTER_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_TRANSVERSE", (long) wxPAPER_A4_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_EXTRA_TRANSVERSE", (long) wxPAPER_LETTER_EXTRA_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A_PLUS", (long) wxPAPER_A_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B_PLUS", (long) wxPAPER_B_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_PLUS", (long) wxPAPER_LETTER_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_PLUS", (long) wxPAPER_A4_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5_TRANSVERSE", (long) wxPAPER_A5_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5_TRANSVERSE", (long) wxPAPER_B5_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_EXTRA", (long) wxPAPER_A3_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5_EXTRA", (long) wxPAPER_A5_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5_EXTRA", (long) wxPAPER_B5_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A2", (long) wxPAPER_A2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_TRANSVERSE", (long) wxPAPER_A3_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_EXTRA_TRANSVERSE", (long) wxPAPER_A3_EXTRA_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_SIMPLEX", (long) wxDUPLEX_SIMPLEX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_HORIZONTAL", (long) wxDUPLEX_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_VERTICAL", (long) wxDUPLEX_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_SEPARATOR", (long) wxITEM_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_NORMAL", (long) wxITEM_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_CHECK", (long) wxITEM_CHECK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_RADIO", (long) wxITEM_RADIO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_MAX", (long) wxITEM_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_NOWHERE", (long) wxHT_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_FIRST", (long) wxHT_SCROLLBAR_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_LINE_1", (long) wxHT_SCROLLBAR_ARROW_LINE_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_LINE_2", (long) wxHT_SCROLLBAR_ARROW_LINE_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_PAGE_1", (long) wxHT_SCROLLBAR_ARROW_PAGE_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_PAGE_2", (long) wxHT_SCROLLBAR_ARROW_PAGE_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_THUMB", (long) wxHT_SCROLLBAR_THUMB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_BAR_1", (long) wxHT_SCROLLBAR_BAR_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_BAR_2", (long) wxHT_SCROLLBAR_BAR_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_LAST", (long) wxHT_SCROLLBAR_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_OUTSIDE", (long) wxHT_WINDOW_OUTSIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_INSIDE", (long) wxHT_WINDOW_INSIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_VERT_SCROLLBAR", (long) wxHT_WINDOW_VERT_SCROLLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_HORZ_SCROLLBAR", (long) wxHT_WINDOW_HORZ_SCROLLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_CORNER", (long) wxHT_WINDOW_CORNER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_MAX", (long) wxHT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_NONE", (long) wxMOD_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_ALT", (long) wxMOD_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_CONTROL", (long) wxMOD_CONTROL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_SHIFT", (long) wxMOD_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_WIN", (long) wxMOD_WIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_NONE", (long) wxUPDATE_UI_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_RECURSE", (long) wxUPDATE_UI_RECURSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_FROMIDLE", (long) wxUPDATE_UI_FROMIDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_INVALID", (long) wxBITMAP_TYPE_INVALID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP", (long) wxBITMAP_TYPE_BMP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO", (long) wxBITMAP_TYPE_ICO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR", (long) wxBITMAP_TYPE_CUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM", (long) wxBITMAP_TYPE_XBM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM_DATA", (long) wxBITMAP_TYPE_XBM_DATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM", (long) wxBITMAP_TYPE_XPM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM_DATA", (long) wxBITMAP_TYPE_XPM_DATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF", (long) wxBITMAP_TYPE_TIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF", (long) wxBITMAP_TYPE_GIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG", (long) wxBITMAP_TYPE_PNG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG", (long) wxBITMAP_TYPE_JPEG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM", (long) wxBITMAP_TYPE_PNM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX", (long) wxBITMAP_TYPE_PCX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT", (long) wxBITMAP_TYPE_PICT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON", (long) wxBITMAP_TYPE_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ANI", (long) wxBITMAP_TYPE_ANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_IFF", (long) wxBITMAP_TYPE_IFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR", (long) wxBITMAP_TYPE_MACCURSOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ANY", (long) wxBITMAP_TYPE_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_NONE", (long) wxCURSOR_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_ARROW", (long) wxCURSOR_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_RIGHT_ARROW", (long) wxCURSOR_RIGHT_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_BULLSEYE", (long) wxCURSOR_BULLSEYE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_CHAR", (long) wxCURSOR_CHAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_CROSS", (long) wxCURSOR_CROSS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_HAND", (long) wxCURSOR_HAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_IBEAM", (long) wxCURSOR_IBEAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_LEFT_BUTTON", (long) wxCURSOR_LEFT_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MAGNIFIER", (long) wxCURSOR_MAGNIFIER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MIDDLE_BUTTON", (long) wxCURSOR_MIDDLE_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_NO_ENTRY", (long) wxCURSOR_NO_ENTRY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_PAINT_BRUSH", (long) wxCURSOR_PAINT_BRUSH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_PENCIL", (long) wxCURSOR_PENCIL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_POINT_LEFT", (long) wxCURSOR_POINT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_POINT_RIGHT", (long) wxCURSOR_POINT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_QUESTION_ARROW", (long) wxCURSOR_QUESTION_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_RIGHT_BUTTON", (long) wxCURSOR_RIGHT_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENESW", (long) wxCURSOR_SIZENESW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENS", (long) wxCURSOR_SIZENS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENWSE", (long) wxCURSOR_SIZENWSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZEWE", (long) wxCURSOR_SIZEWE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZING", (long) wxCURSOR_SIZING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SPRAYCAN", (long) wxCURSOR_SPRAYCAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_WAIT", (long) wxCURSOR_WAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_WATCH", (long) wxCURSOR_WATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_BLANK", (long) wxCURSOR_BLANK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_DEFAULT", (long) wxCURSOR_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_COPY_ARROW", (long) wxCURSOR_COPY_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_ARROWWAIT", (long) wxCURSOR_ARROWWAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MAX", (long) wxCURSOR_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromStart", (long) wxFromStart, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromCurrent", (long) wxFromCurrent, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromEnd", (long) wxFromEnd, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_RESOLUTION_INCHES", (long) wxIMAGE_RESOLUTION_INCHES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_RESOLUTION_CM", (long) wxIMAGE_RESOLUTION_CM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_24BPP", (long) wxBMP_24BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP", (long) wxBMP_8BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_GREY", (long) wxBMP_8BPP_GREY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_GRAY", (long) wxBMP_8BPP_GRAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_RED", (long) wxBMP_8BPP_RED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_PALETTE", (long) wxBMP_8BPP_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_4BPP", (long) wxBMP_4BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_1BPP", (long) wxBMP_1BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_1BPP_BW", (long) wxBMP_1BPP_BW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EVENT_PROPAGATE_NONE", (long) wxEVENT_PROPAGATE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EVENT_PROPAGATE_MAX", (long) wxEVENT_PROPAGATE_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NULL", (long) wxEVT_NULL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_FIRST", (long) wxEVT_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_USER_FIRST", (long) wxEVT_USER_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_BUTTON_CLICKED", (long) wxEVT_COMMAND_BUTTON_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHECKBOX_CLICKED", (long) wxEVT_COMMAND_CHECKBOX_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHOICE_SELECTED", (long) wxEVT_COMMAND_CHOICE_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOX_SELECTED", (long) wxEVT_COMMAND_LISTBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOX_DOUBLECLICKED", (long) wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHECKLISTBOX_TOGGLED", (long) wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MENU_SELECTED", (long) wxEVT_COMMAND_MENU_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_CLICKED", (long) wxEVT_COMMAND_TOOL_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SLIDER_UPDATED", (long) wxEVT_COMMAND_SLIDER_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RADIOBOX_SELECTED", (long) wxEVT_COMMAND_RADIOBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RADIOBUTTON_SELECTED", (long) wxEVT_COMMAND_RADIOBUTTON_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SCROLLBAR_UPDATED", (long) wxEVT_COMMAND_SCROLLBAR_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_VLBOX_SELECTED", (long) wxEVT_COMMAND_VLBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_COMBOBOX_SELECTED", (long) wxEVT_COMMAND_COMBOBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_RCLICKED", (long) wxEVT_COMMAND_TOOL_RCLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_ENTER", (long) wxEVT_COMMAND_TOOL_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_DOWN", (long) wxEVT_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_UP", (long) wxEVT_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_DOWN", (long) wxEVT_MIDDLE_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_UP", (long) wxEVT_MIDDLE_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_DOWN", (long) wxEVT_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_UP", (long) wxEVT_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOTION", (long) wxEVT_MOTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ENTER_WINDOW", (long) wxEVT_ENTER_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEAVE_WINDOW", (long) wxEVT_LEAVE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_DCLICK", (long) wxEVT_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_DCLICK", (long) wxEVT_MIDDLE_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_DCLICK", (long) wxEVT_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SET_FOCUS", (long) wxEVT_SET_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KILL_FOCUS", (long) wxEVT_KILL_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHILD_FOCUS", (long) wxEVT_CHILD_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOUSEWHEEL", (long) wxEVT_MOUSEWHEEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_DOWN", (long) wxEVT_NC_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_UP", (long) wxEVT_NC_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_DOWN", (long) wxEVT_NC_MIDDLE_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_UP", (long) wxEVT_NC_MIDDLE_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_DOWN", (long) wxEVT_NC_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_UP", (long) wxEVT_NC_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MOTION", (long) wxEVT_NC_MOTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_ENTER_WINDOW", (long) wxEVT_NC_ENTER_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEAVE_WINDOW", (long) wxEVT_NC_LEAVE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_DCLICK", (long) wxEVT_NC_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_DCLICK", (long) wxEVT_NC_MIDDLE_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_DCLICK", (long) wxEVT_NC_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHAR", (long) wxEVT_CHAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHAR_HOOK", (long) wxEVT_CHAR_HOOK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NAVIGATION_KEY", (long) wxEVT_NAVIGATION_KEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KEY_DOWN", (long) wxEVT_KEY_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KEY_UP", (long) wxEVT_KEY_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_HOTKEY", (long) wxEVT_HOTKEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SET_CURSOR", (long) wxEVT_SET_CURSOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_TOP", (long) wxEVT_SCROLL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_BOTTOM", (long) wxEVT_SCROLL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_LINEUP", (long) wxEVT_SCROLL_LINEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_LINEDOWN", (long) wxEVT_SCROLL_LINEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_PAGEUP", (long) wxEVT_SCROLL_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_PAGEDOWN", (long) wxEVT_SCROLL_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_THUMBTRACK", (long) wxEVT_SCROLL_THUMBTRACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_THUMBRELEASE", (long) wxEVT_SCROLL_THUMBRELEASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_ENDSCROLL", (long) wxEVT_SCROLL_ENDSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_TOP", (long) wxEVT_SCROLLWIN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_BOTTOM", (long) wxEVT_SCROLLWIN_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_LINEUP", (long) wxEVT_SCROLLWIN_LINEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_LINEDOWN", (long) wxEVT_SCROLLWIN_LINEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_PAGEUP", (long) wxEVT_SCROLLWIN_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_PAGEDOWN", (long) wxEVT_SCROLLWIN_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_THUMBTRACK", (long) wxEVT_SCROLLWIN_THUMBTRACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_THUMBRELEASE", (long) wxEVT_SCROLLWIN_THUMBRELEASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SIZE", (long) wxEVT_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOVE", (long) wxEVT_MOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CLOSE_WINDOW", (long) wxEVT_CLOSE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_END_SESSION", (long) wxEVT_END_SESSION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_END_SESSION", (long) wxEVT_QUERY_END_SESSION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ACTIVATE_APP", (long) wxEVT_ACTIVATE_APP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_POWER", (long) wxEVT_POWER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ACTIVATE", (long) wxEVT_ACTIVATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CREATE", (long) wxEVT_CREATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DESTROY", (long) wxEVT_DESTROY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SHOW", (long) wxEVT_SHOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ICONIZE", (long) wxEVT_ICONIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MAXIMIZE", (long) wxEVT_MAXIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOUSE_CAPTURE_CHANGED", (long) wxEVT_MOUSE_CAPTURE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PAINT", (long) wxEVT_PAINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ERASE_BACKGROUND", (long) wxEVT_ERASE_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_PAINT", (long) wxEVT_NC_PAINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PAINT_ICON", (long) wxEVT_PAINT_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_OPEN", (long) wxEVT_MENU_OPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_CLOSE", (long) wxEVT_MENU_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_HIGHLIGHT", (long) wxEVT_MENU_HIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CONTEXT_MENU", (long) wxEVT_CONTEXT_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SYS_COLOUR_CHANGED", (long) wxEVT_SYS_COLOUR_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DISPLAY_CHANGED", (long) wxEVT_DISPLAY_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SETTING_CHANGED", (long) wxEVT_SETTING_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_NEW_PALETTE", (long) wxEVT_QUERY_NEW_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PALETTE_CHANGED", (long) wxEVT_PALETTE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DROP_FILES", (long) wxEVT_DROP_FILES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DRAW_ITEM", (long) wxEVT_DRAW_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MEASURE_ITEM", (long) wxEVT_MEASURE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMPARE_ITEM", (long) wxEVT_COMPARE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_INIT_DIALOG", (long) wxEVT_INIT_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_IDLE", (long) wxEVT_IDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_UPDATE_UI", (long) wxEVT_UPDATE_UI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SIZING", (long) wxEVT_SIZING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOVING", (long) wxEVT_MOVING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LEFT_CLICK", (long) wxEVT_COMMAND_LEFT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LEFT_DCLICK", (long) wxEVT_COMMAND_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RIGHT_CLICK", (long) wxEVT_COMMAND_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RIGHT_DCLICK", (long) wxEVT_COMMAND_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SET_FOCUS", (long) wxEVT_COMMAND_SET_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_KILL_FOCUS", (long) wxEVT_COMMAND_KILL_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_ENTER", (long) wxEVT_COMMAND_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_ANY", (long) wxMOUSE_BTN_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_NONE", (long) wxMOUSE_BTN_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_LEFT", (long) wxMOUSE_BTN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_MIDDLE", (long) wxMOUSE_BTN_MIDDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_RIGHT", (long) wxMOUSE_BTN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_PROCESS_ALL", (long) wxUPDATE_UI_PROCESS_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_PROCESS_SPECIFIED", (long) wxUPDATE_UI_PROCESS_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDLE_PROCESS_ALL", (long) wxIDLE_PROCESS_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDLE_PROCESS_SPECIFIED", (long) wxIDLE_PROCESS_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_SUPPRESS", (long) wxPYAPP_ASSERT_SUPPRESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_EXCEPTION", (long) wxPYAPP_ASSERT_EXCEPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_DIALOG", (long) wxPYAPP_ASSERT_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_LOG", (long) wxPYAPP_ASSERT_LOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_WINDOWS", (long) wxPRINT_WINDOWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_POSTSCRIPT", (long) wxPRINT_POSTSCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_NONE", (long) wxFLEX_GROWMODE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_SPECIFIED", (long) wxFLEX_GROWMODE_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_ALL", (long) wxFLEX_GROWMODE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Left", (long) wxLeft, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Top", (long) wxTop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Right", (long) wxRight, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Bottom", (long) wxBottom, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Width", (long) wxWidth, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Height", (long) wxHeight, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Centre", (long) wxCentre, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Center", (long) wxCenter, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CentreX", (long) wxCentreX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CentreY", (long) wxCentreY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Unconstrained", (long) wxUnconstrained, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AsIs", (long) wxAsIs, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PercentOf", (long) wxPercentOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Above", (long) wxAbove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Below", (long) wxBelow, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LeftOf", (long) wxLeftOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RightOf", (long) wxRightOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SameAs", (long) wxSameAs, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Absolute", (long) wxAbsolute, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -38726,10 +40393,602 @@ SWIGEXPORT(void) SWIG_init(void) { Py_XDECREF(cobj); #endif + PyDict_SetItemString(d,"NOT_FOUND", SWIG_PyObj_FromInt((int)wxNOT_FOUND)); + PyDict_SetItemString(d,"VSCROLL", SWIG_PyObj_FromInt((int)wxVSCROLL)); + PyDict_SetItemString(d,"HSCROLL", SWIG_PyObj_FromInt((int)wxHSCROLL)); + PyDict_SetItemString(d,"CAPTION", SWIG_PyObj_FromInt((int)wxCAPTION)); + PyDict_SetItemString(d,"DOUBLE_BORDER", SWIG_PyObj_FromInt((int)wxDOUBLE_BORDER)); + PyDict_SetItemString(d,"SUNKEN_BORDER", SWIG_PyObj_FromInt((int)wxSUNKEN_BORDER)); + PyDict_SetItemString(d,"RAISED_BORDER", SWIG_PyObj_FromInt((int)wxRAISED_BORDER)); + PyDict_SetItemString(d,"BORDER", SWIG_PyObj_FromInt((int)wxBORDER)); + PyDict_SetItemString(d,"SIMPLE_BORDER", SWIG_PyObj_FromInt((int)wxSIMPLE_BORDER)); + PyDict_SetItemString(d,"STATIC_BORDER", SWIG_PyObj_FromInt((int)wxSTATIC_BORDER)); + PyDict_SetItemString(d,"TRANSPARENT_WINDOW", SWIG_PyObj_FromInt((int)wxTRANSPARENT_WINDOW)); + PyDict_SetItemString(d,"NO_BORDER", SWIG_PyObj_FromInt((int)wxNO_BORDER)); + PyDict_SetItemString(d,"USER_COLOURS", SWIG_PyObj_FromInt((int)wxUSER_COLOURS)); + PyDict_SetItemString(d,"NO_3D", SWIG_PyObj_FromInt((int)wxNO_3D)); + PyDict_SetItemString(d,"TAB_TRAVERSAL", SWIG_PyObj_FromInt((int)wxTAB_TRAVERSAL)); + PyDict_SetItemString(d,"WANTS_CHARS", SWIG_PyObj_FromInt((int)wxWANTS_CHARS)); + PyDict_SetItemString(d,"POPUP_WINDOW", SWIG_PyObj_FromInt((int)wxPOPUP_WINDOW)); + PyDict_SetItemString(d,"CENTER_FRAME", SWIG_PyObj_FromInt((int)wxCENTER_FRAME)); + PyDict_SetItemString(d,"CENTRE_ON_SCREEN", SWIG_PyObj_FromInt((int)wxCENTRE_ON_SCREEN)); + PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_PyObj_FromInt((int)wxCENTER_ON_SCREEN)); + PyDict_SetItemString(d,"STAY_ON_TOP", SWIG_PyObj_FromInt((int)wxSTAY_ON_TOP)); + PyDict_SetItemString(d,"ICONIZE", SWIG_PyObj_FromInt((int)wxICONIZE)); + PyDict_SetItemString(d,"MINIMIZE", SWIG_PyObj_FromInt((int)wxMINIMIZE)); + PyDict_SetItemString(d,"MAXIMIZE", SWIG_PyObj_FromInt((int)wxMAXIMIZE)); + PyDict_SetItemString(d,"CLOSE_BOX", SWIG_PyObj_FromInt((int)wxCLOSE_BOX)); + PyDict_SetItemString(d,"THICK_FRAME", SWIG_PyObj_FromInt((int)wxTHICK_FRAME)); + PyDict_SetItemString(d,"SYSTEM_MENU", SWIG_PyObj_FromInt((int)wxSYSTEM_MENU)); + PyDict_SetItemString(d,"MINIMIZE_BOX", SWIG_PyObj_FromInt((int)wxMINIMIZE_BOX)); + PyDict_SetItemString(d,"MAXIMIZE_BOX", SWIG_PyObj_FromInt((int)wxMAXIMIZE_BOX)); + PyDict_SetItemString(d,"TINY_CAPTION_HORIZ", SWIG_PyObj_FromInt((int)wxTINY_CAPTION_HORIZ)); + PyDict_SetItemString(d,"TINY_CAPTION_VERT", SWIG_PyObj_FromInt((int)wxTINY_CAPTION_VERT)); + PyDict_SetItemString(d,"RESIZE_BOX", SWIG_PyObj_FromInt((int)wxRESIZE_BOX)); + PyDict_SetItemString(d,"RESIZE_BORDER", SWIG_PyObj_FromInt((int)wxRESIZE_BORDER)); + PyDict_SetItemString(d,"DIALOG_MODAL", SWIG_PyObj_FromInt((int)wxDIALOG_MODAL)); + PyDict_SetItemString(d,"DIALOG_MODELESS", SWIG_PyObj_FromInt((int)wxDIALOG_MODELESS)); + PyDict_SetItemString(d,"DIALOG_NO_PARENT", SWIG_PyObj_FromInt((int)wxDIALOG_NO_PARENT)); + PyDict_SetItemString(d,"DEFAULT_FRAME_STYLE", SWIG_PyObj_FromInt((int)wxDEFAULT_FRAME_STYLE)); + PyDict_SetItemString(d,"DEFAULT_DIALOG_STYLE", SWIG_PyObj_FromInt((int)wxDEFAULT_DIALOG_STYLE)); + PyDict_SetItemString(d,"FRAME_TOOL_WINDOW", SWIG_PyObj_FromInt((int)wxFRAME_TOOL_WINDOW)); + PyDict_SetItemString(d,"FRAME_FLOAT_ON_PARENT", SWIG_PyObj_FromInt((int)wxFRAME_FLOAT_ON_PARENT)); + PyDict_SetItemString(d,"FRAME_NO_WINDOW_MENU", SWIG_PyObj_FromInt((int)wxFRAME_NO_WINDOW_MENU)); + PyDict_SetItemString(d,"FRAME_NO_TASKBAR", SWIG_PyObj_FromInt((int)wxFRAME_NO_TASKBAR)); + PyDict_SetItemString(d,"FRAME_SHAPED", SWIG_PyObj_FromInt((int)wxFRAME_SHAPED)); + PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_PyObj_FromInt((int)wxED_CLIENT_MARGIN)); + PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_PyObj_FromInt((int)wxED_BUTTONS_BOTTOM)); + PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_PyObj_FromInt((int)wxED_BUTTONS_RIGHT)); + PyDict_SetItemString(d,"ED_STATIC_LINE", SWIG_PyObj_FromInt((int)wxED_STATIC_LINE)); + PyDict_SetItemString(d,"EXT_DIALOG_STYLE", SWIG_PyObj_FromInt((int)wxEXT_DIALOG_STYLE)); + PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_PyObj_FromInt((int)wxCLIP_CHILDREN)); + PyDict_SetItemString(d,"CLIP_SIBLINGS", SWIG_PyObj_FromInt((int)wxCLIP_SIBLINGS)); + PyDict_SetItemString(d,"RETAINED", SWIG_PyObj_FromInt((int)wxRETAINED)); + PyDict_SetItemString(d,"BACKINGSTORE", SWIG_PyObj_FromInt((int)wxBACKINGSTORE)); + PyDict_SetItemString(d,"COLOURED", SWIG_PyObj_FromInt((int)wxCOLOURED)); + PyDict_SetItemString(d,"FIXED_LENGTH", SWIG_PyObj_FromInt((int)wxFIXED_LENGTH)); + PyDict_SetItemString(d,"LB_NEEDED_SB", SWIG_PyObj_FromInt((int)wxLB_NEEDED_SB)); + PyDict_SetItemString(d,"LB_ALWAYS_SB", SWIG_PyObj_FromInt((int)wxLB_ALWAYS_SB)); + PyDict_SetItemString(d,"LB_SORT", SWIG_PyObj_FromInt((int)wxLB_SORT)); + PyDict_SetItemString(d,"LB_SINGLE", SWIG_PyObj_FromInt((int)wxLB_SINGLE)); + PyDict_SetItemString(d,"LB_MULTIPLE", SWIG_PyObj_FromInt((int)wxLB_MULTIPLE)); + PyDict_SetItemString(d,"LB_EXTENDED", SWIG_PyObj_FromInt((int)wxLB_EXTENDED)); + PyDict_SetItemString(d,"LB_OWNERDRAW", SWIG_PyObj_FromInt((int)wxLB_OWNERDRAW)); + PyDict_SetItemString(d,"LB_HSCROLL", SWIG_PyObj_FromInt((int)wxLB_HSCROLL)); + PyDict_SetItemString(d,"PROCESS_ENTER", SWIG_PyObj_FromInt((int)wxPROCESS_ENTER)); + PyDict_SetItemString(d,"PASSWORD", SWIG_PyObj_FromInt((int)wxPASSWORD)); + PyDict_SetItemString(d,"CB_SIMPLE", SWIG_PyObj_FromInt((int)wxCB_SIMPLE)); + PyDict_SetItemString(d,"CB_DROPDOWN", SWIG_PyObj_FromInt((int)wxCB_DROPDOWN)); + PyDict_SetItemString(d,"CB_SORT", SWIG_PyObj_FromInt((int)wxCB_SORT)); + PyDict_SetItemString(d,"CB_READONLY", SWIG_PyObj_FromInt((int)wxCB_READONLY)); + PyDict_SetItemString(d,"RA_HORIZONTAL", SWIG_PyObj_FromInt((int)wxRA_HORIZONTAL)); + PyDict_SetItemString(d,"RA_VERTICAL", SWIG_PyObj_FromInt((int)wxRA_VERTICAL)); + PyDict_SetItemString(d,"RA_SPECIFY_ROWS", SWIG_PyObj_FromInt((int)wxRA_SPECIFY_ROWS)); + PyDict_SetItemString(d,"RA_SPECIFY_COLS", SWIG_PyObj_FromInt((int)wxRA_SPECIFY_COLS)); + PyDict_SetItemString(d,"RB_GROUP", SWIG_PyObj_FromInt((int)wxRB_GROUP)); + PyDict_SetItemString(d,"RB_SINGLE", SWIG_PyObj_FromInt((int)wxRB_SINGLE)); + PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSL_HORIZONTAL)); + PyDict_SetItemString(d,"SL_VERTICAL", SWIG_PyObj_FromInt((int)wxSL_VERTICAL)); + PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_PyObj_FromInt((int)wxSL_AUTOTICKS)); + PyDict_SetItemString(d,"SL_LABELS", SWIG_PyObj_FromInt((int)wxSL_LABELS)); + PyDict_SetItemString(d,"SL_LEFT", SWIG_PyObj_FromInt((int)wxSL_LEFT)); + PyDict_SetItemString(d,"SL_TOP", SWIG_PyObj_FromInt((int)wxSL_TOP)); + PyDict_SetItemString(d,"SL_RIGHT", SWIG_PyObj_FromInt((int)wxSL_RIGHT)); + PyDict_SetItemString(d,"SL_BOTTOM", SWIG_PyObj_FromInt((int)wxSL_BOTTOM)); + PyDict_SetItemString(d,"SL_BOTH", SWIG_PyObj_FromInt((int)wxSL_BOTH)); + PyDict_SetItemString(d,"SL_SELRANGE", SWIG_PyObj_FromInt((int)wxSL_SELRANGE)); + PyDict_SetItemString(d,"SB_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSB_HORIZONTAL)); + PyDict_SetItemString(d,"SB_VERTICAL", SWIG_PyObj_FromInt((int)wxSB_VERTICAL)); + PyDict_SetItemString(d,"ST_SIZEGRIP", SWIG_PyObj_FromInt((int)wxST_SIZEGRIP)); + PyDict_SetItemString(d,"ST_NO_AUTORESIZE", SWIG_PyObj_FromInt((int)wxST_NO_AUTORESIZE)); + PyDict_SetItemString(d,"FLOOD_SURFACE", SWIG_PyObj_FromInt((int)wxFLOOD_SURFACE)); + PyDict_SetItemString(d,"FLOOD_BORDER", SWIG_PyObj_FromInt((int)wxFLOOD_BORDER)); + PyDict_SetItemString(d,"ODDEVEN_RULE", SWIG_PyObj_FromInt((int)wxODDEVEN_RULE)); + PyDict_SetItemString(d,"WINDING_RULE", SWIG_PyObj_FromInt((int)wxWINDING_RULE)); + PyDict_SetItemString(d,"TOOL_TOP", SWIG_PyObj_FromInt((int)wxTOOL_TOP)); + PyDict_SetItemString(d,"TOOL_BOTTOM", SWIG_PyObj_FromInt((int)wxTOOL_BOTTOM)); + PyDict_SetItemString(d,"TOOL_LEFT", SWIG_PyObj_FromInt((int)wxTOOL_LEFT)); + PyDict_SetItemString(d,"TOOL_RIGHT", SWIG_PyObj_FromInt((int)wxTOOL_RIGHT)); + PyDict_SetItemString(d,"OK", SWIG_PyObj_FromInt((int)wxOK)); + PyDict_SetItemString(d,"YES_NO", SWIG_PyObj_FromInt((int)wxYES_NO)); + PyDict_SetItemString(d,"CANCEL", SWIG_PyObj_FromInt((int)wxCANCEL)); + PyDict_SetItemString(d,"YES", SWIG_PyObj_FromInt((int)wxYES)); + PyDict_SetItemString(d,"NO", SWIG_PyObj_FromInt((int)wxNO)); + PyDict_SetItemString(d,"NO_DEFAULT", SWIG_PyObj_FromInt((int)wxNO_DEFAULT)); + PyDict_SetItemString(d,"YES_DEFAULT", SWIG_PyObj_FromInt((int)wxYES_DEFAULT)); + PyDict_SetItemString(d,"ICON_EXCLAMATION", SWIG_PyObj_FromInt((int)wxICON_EXCLAMATION)); + PyDict_SetItemString(d,"ICON_HAND", SWIG_PyObj_FromInt((int)wxICON_HAND)); + PyDict_SetItemString(d,"ICON_QUESTION", SWIG_PyObj_FromInt((int)wxICON_QUESTION)); + PyDict_SetItemString(d,"ICON_INFORMATION", SWIG_PyObj_FromInt((int)wxICON_INFORMATION)); + PyDict_SetItemString(d,"ICON_STOP", SWIG_PyObj_FromInt((int)wxICON_STOP)); + PyDict_SetItemString(d,"ICON_ASTERISK", SWIG_PyObj_FromInt((int)wxICON_ASTERISK)); + PyDict_SetItemString(d,"ICON_MASK", SWIG_PyObj_FromInt((int)wxICON_MASK)); + PyDict_SetItemString(d,"ICON_WARNING", SWIG_PyObj_FromInt((int)wxICON_WARNING)); + PyDict_SetItemString(d,"ICON_ERROR", SWIG_PyObj_FromInt((int)wxICON_ERROR)); + PyDict_SetItemString(d,"FORWARD", SWIG_PyObj_FromInt((int)wxFORWARD)); + PyDict_SetItemString(d,"BACKWARD", SWIG_PyObj_FromInt((int)wxBACKWARD)); + PyDict_SetItemString(d,"RESET", SWIG_PyObj_FromInt((int)wxRESET)); + PyDict_SetItemString(d,"HELP", SWIG_PyObj_FromInt((int)wxHELP)); + PyDict_SetItemString(d,"MORE", SWIG_PyObj_FromInt((int)wxMORE)); + PyDict_SetItemString(d,"SETUP", SWIG_PyObj_FromInt((int)wxSETUP)); + PyDict_SetItemString(d,"SIZE_AUTO_WIDTH", SWIG_PyObj_FromInt((int)wxSIZE_AUTO_WIDTH)); + PyDict_SetItemString(d,"SIZE_AUTO_HEIGHT", SWIG_PyObj_FromInt((int)wxSIZE_AUTO_HEIGHT)); + PyDict_SetItemString(d,"SIZE_AUTO", SWIG_PyObj_FromInt((int)wxSIZE_AUTO)); + PyDict_SetItemString(d,"SIZE_USE_EXISTING", SWIG_PyObj_FromInt((int)wxSIZE_USE_EXISTING)); + PyDict_SetItemString(d,"SIZE_ALLOW_MINUS_ONE", SWIG_PyObj_FromInt((int)wxSIZE_ALLOW_MINUS_ONE)); + PyDict_SetItemString(d,"PORTRAIT", SWIG_PyObj_FromInt((int)wxPORTRAIT)); + PyDict_SetItemString(d,"LANDSCAPE", SWIG_PyObj_FromInt((int)wxLANDSCAPE)); + PyDict_SetItemString(d,"PRINT_QUALITY_HIGH", SWIG_PyObj_FromInt((int)wxPRINT_QUALITY_HIGH)); + PyDict_SetItemString(d,"PRINT_QUALITY_MEDIUM", SWIG_PyObj_FromInt((int)wxPRINT_QUALITY_MEDIUM)); + PyDict_SetItemString(d,"PRINT_QUALITY_LOW", SWIG_PyObj_FromInt((int)wxPRINT_QUALITY_LOW)); + PyDict_SetItemString(d,"PRINT_QUALITY_DRAFT", SWIG_PyObj_FromInt((int)wxPRINT_QUALITY_DRAFT)); + PyDict_SetItemString(d,"ID_ANY", SWIG_PyObj_FromInt((int)wxID_ANY)); + PyDict_SetItemString(d,"ID_SEPARATOR", SWIG_PyObj_FromInt((int)wxID_SEPARATOR)); + PyDict_SetItemString(d,"ID_LOWEST", SWIG_PyObj_FromInt((int)wxID_LOWEST)); + PyDict_SetItemString(d,"ID_OPEN", SWIG_PyObj_FromInt((int)wxID_OPEN)); + PyDict_SetItemString(d,"ID_CLOSE", SWIG_PyObj_FromInt((int)wxID_CLOSE)); + PyDict_SetItemString(d,"ID_NEW", SWIG_PyObj_FromInt((int)wxID_NEW)); + PyDict_SetItemString(d,"ID_SAVE", SWIG_PyObj_FromInt((int)wxID_SAVE)); + PyDict_SetItemString(d,"ID_SAVEAS", SWIG_PyObj_FromInt((int)wxID_SAVEAS)); + PyDict_SetItemString(d,"ID_REVERT", SWIG_PyObj_FromInt((int)wxID_REVERT)); + PyDict_SetItemString(d,"ID_EXIT", SWIG_PyObj_FromInt((int)wxID_EXIT)); + PyDict_SetItemString(d,"ID_UNDO", SWIG_PyObj_FromInt((int)wxID_UNDO)); + PyDict_SetItemString(d,"ID_REDO", SWIG_PyObj_FromInt((int)wxID_REDO)); + PyDict_SetItemString(d,"ID_HELP", SWIG_PyObj_FromInt((int)wxID_HELP)); + PyDict_SetItemString(d,"ID_PRINT", SWIG_PyObj_FromInt((int)wxID_PRINT)); + PyDict_SetItemString(d,"ID_PRINT_SETUP", SWIG_PyObj_FromInt((int)wxID_PRINT_SETUP)); + PyDict_SetItemString(d,"ID_PREVIEW", SWIG_PyObj_FromInt((int)wxID_PREVIEW)); + PyDict_SetItemString(d,"ID_ABOUT", SWIG_PyObj_FromInt((int)wxID_ABOUT)); + PyDict_SetItemString(d,"ID_HELP_CONTENTS", SWIG_PyObj_FromInt((int)wxID_HELP_CONTENTS)); + PyDict_SetItemString(d,"ID_HELP_COMMANDS", SWIG_PyObj_FromInt((int)wxID_HELP_COMMANDS)); + PyDict_SetItemString(d,"ID_HELP_PROCEDURES", SWIG_PyObj_FromInt((int)wxID_HELP_PROCEDURES)); + PyDict_SetItemString(d,"ID_HELP_CONTEXT", SWIG_PyObj_FromInt((int)wxID_HELP_CONTEXT)); + PyDict_SetItemString(d,"ID_CLOSE_ALL", SWIG_PyObj_FromInt((int)wxID_CLOSE_ALL)); + PyDict_SetItemString(d,"ID_PREFERENCES", SWIG_PyObj_FromInt((int)wxID_PREFERENCES)); + PyDict_SetItemString(d,"ID_CUT", SWIG_PyObj_FromInt((int)wxID_CUT)); + PyDict_SetItemString(d,"ID_COPY", SWIG_PyObj_FromInt((int)wxID_COPY)); + PyDict_SetItemString(d,"ID_PASTE", SWIG_PyObj_FromInt((int)wxID_PASTE)); + PyDict_SetItemString(d,"ID_CLEAR", SWIG_PyObj_FromInt((int)wxID_CLEAR)); + PyDict_SetItemString(d,"ID_FIND", SWIG_PyObj_FromInt((int)wxID_FIND)); + PyDict_SetItemString(d,"ID_DUPLICATE", SWIG_PyObj_FromInt((int)wxID_DUPLICATE)); + PyDict_SetItemString(d,"ID_SELECTALL", SWIG_PyObj_FromInt((int)wxID_SELECTALL)); + PyDict_SetItemString(d,"ID_DELETE", SWIG_PyObj_FromInt((int)wxID_DELETE)); + PyDict_SetItemString(d,"ID_REPLACE", SWIG_PyObj_FromInt((int)wxID_REPLACE)); + PyDict_SetItemString(d,"ID_REPLACE_ALL", SWIG_PyObj_FromInt((int)wxID_REPLACE_ALL)); + PyDict_SetItemString(d,"ID_PROPERTIES", SWIG_PyObj_FromInt((int)wxID_PROPERTIES)); + PyDict_SetItemString(d,"ID_VIEW_DETAILS", SWIG_PyObj_FromInt((int)wxID_VIEW_DETAILS)); + PyDict_SetItemString(d,"ID_VIEW_LARGEICONS", SWIG_PyObj_FromInt((int)wxID_VIEW_LARGEICONS)); + PyDict_SetItemString(d,"ID_VIEW_SMALLICONS", SWIG_PyObj_FromInt((int)wxID_VIEW_SMALLICONS)); + PyDict_SetItemString(d,"ID_VIEW_LIST", SWIG_PyObj_FromInt((int)wxID_VIEW_LIST)); + PyDict_SetItemString(d,"ID_VIEW_SORTDATE", SWIG_PyObj_FromInt((int)wxID_VIEW_SORTDATE)); + PyDict_SetItemString(d,"ID_VIEW_SORTNAME", SWIG_PyObj_FromInt((int)wxID_VIEW_SORTNAME)); + PyDict_SetItemString(d,"ID_VIEW_SORTSIZE", SWIG_PyObj_FromInt((int)wxID_VIEW_SORTSIZE)); + PyDict_SetItemString(d,"ID_VIEW_SORTTYPE", SWIG_PyObj_FromInt((int)wxID_VIEW_SORTTYPE)); + PyDict_SetItemString(d,"ID_FILE1", SWIG_PyObj_FromInt((int)wxID_FILE1)); + PyDict_SetItemString(d,"ID_FILE2", SWIG_PyObj_FromInt((int)wxID_FILE2)); + PyDict_SetItemString(d,"ID_FILE3", SWIG_PyObj_FromInt((int)wxID_FILE3)); + PyDict_SetItemString(d,"ID_FILE4", SWIG_PyObj_FromInt((int)wxID_FILE4)); + PyDict_SetItemString(d,"ID_FILE5", SWIG_PyObj_FromInt((int)wxID_FILE5)); + PyDict_SetItemString(d,"ID_FILE6", SWIG_PyObj_FromInt((int)wxID_FILE6)); + PyDict_SetItemString(d,"ID_FILE7", SWIG_PyObj_FromInt((int)wxID_FILE7)); + PyDict_SetItemString(d,"ID_FILE8", SWIG_PyObj_FromInt((int)wxID_FILE8)); + PyDict_SetItemString(d,"ID_FILE9", SWIG_PyObj_FromInt((int)wxID_FILE9)); + PyDict_SetItemString(d,"ID_OK", SWIG_PyObj_FromInt((int)wxID_OK)); + PyDict_SetItemString(d,"ID_CANCEL", SWIG_PyObj_FromInt((int)wxID_CANCEL)); + PyDict_SetItemString(d,"ID_APPLY", SWIG_PyObj_FromInt((int)wxID_APPLY)); + PyDict_SetItemString(d,"ID_YES", SWIG_PyObj_FromInt((int)wxID_YES)); + PyDict_SetItemString(d,"ID_NO", SWIG_PyObj_FromInt((int)wxID_NO)); + PyDict_SetItemString(d,"ID_STATIC", SWIG_PyObj_FromInt((int)wxID_STATIC)); + PyDict_SetItemString(d,"ID_FORWARD", SWIG_PyObj_FromInt((int)wxID_FORWARD)); + PyDict_SetItemString(d,"ID_BACKWARD", SWIG_PyObj_FromInt((int)wxID_BACKWARD)); + PyDict_SetItemString(d,"ID_DEFAULT", SWIG_PyObj_FromInt((int)wxID_DEFAULT)); + PyDict_SetItemString(d,"ID_MORE", SWIG_PyObj_FromInt((int)wxID_MORE)); + PyDict_SetItemString(d,"ID_SETUP", SWIG_PyObj_FromInt((int)wxID_SETUP)); + PyDict_SetItemString(d,"ID_RESET", SWIG_PyObj_FromInt((int)wxID_RESET)); + PyDict_SetItemString(d,"ID_CONTEXT_HELP", SWIG_PyObj_FromInt((int)wxID_CONTEXT_HELP)); + PyDict_SetItemString(d,"ID_YESTOALL", SWIG_PyObj_FromInt((int)wxID_YESTOALL)); + PyDict_SetItemString(d,"ID_NOTOALL", SWIG_PyObj_FromInt((int)wxID_NOTOALL)); + PyDict_SetItemString(d,"ID_ABORT", SWIG_PyObj_FromInt((int)wxID_ABORT)); + PyDict_SetItemString(d,"ID_RETRY", SWIG_PyObj_FromInt((int)wxID_RETRY)); + PyDict_SetItemString(d,"ID_IGNORE", SWIG_PyObj_FromInt((int)wxID_IGNORE)); + PyDict_SetItemString(d,"ID_HIGHEST", SWIG_PyObj_FromInt((int)wxID_HIGHEST)); + PyDict_SetItemString(d,"OPEN", SWIG_PyObj_FromInt((int)wxOPEN)); + PyDict_SetItemString(d,"SAVE", SWIG_PyObj_FromInt((int)wxSAVE)); + PyDict_SetItemString(d,"HIDE_READONLY", SWIG_PyObj_FromInt((int)wxHIDE_READONLY)); + PyDict_SetItemString(d,"OVERWRITE_PROMPT", SWIG_PyObj_FromInt((int)wxOVERWRITE_PROMPT)); + PyDict_SetItemString(d,"FILE_MUST_EXIST", SWIG_PyObj_FromInt((int)wxFILE_MUST_EXIST)); + PyDict_SetItemString(d,"MULTIPLE", SWIG_PyObj_FromInt((int)wxMULTIPLE)); + PyDict_SetItemString(d,"CHANGE_DIR", SWIG_PyObj_FromInt((int)wxCHANGE_DIR)); + PyDict_SetItemString(d,"ACCEL_ALT", SWIG_PyObj_FromInt((int)wxACCEL_ALT)); + PyDict_SetItemString(d,"ACCEL_CTRL", SWIG_PyObj_FromInt((int)wxACCEL_CTRL)); + PyDict_SetItemString(d,"ACCEL_SHIFT", SWIG_PyObj_FromInt((int)wxACCEL_SHIFT)); + PyDict_SetItemString(d,"ACCEL_NORMAL", SWIG_PyObj_FromInt((int)wxACCEL_NORMAL)); + PyDict_SetItemString(d,"PD_AUTO_HIDE", SWIG_PyObj_FromInt((int)wxPD_AUTO_HIDE)); + PyDict_SetItemString(d,"PD_APP_MODAL", SWIG_PyObj_FromInt((int)wxPD_APP_MODAL)); + PyDict_SetItemString(d,"PD_CAN_ABORT", SWIG_PyObj_FromInt((int)wxPD_CAN_ABORT)); + PyDict_SetItemString(d,"PD_ELAPSED_TIME", SWIG_PyObj_FromInt((int)wxPD_ELAPSED_TIME)); + PyDict_SetItemString(d,"PD_ESTIMATED_TIME", SWIG_PyObj_FromInt((int)wxPD_ESTIMATED_TIME)); + PyDict_SetItemString(d,"PD_REMAINING_TIME", SWIG_PyObj_FromInt((int)wxPD_REMAINING_TIME)); + PyDict_SetItemString(d,"DD_NEW_DIR_BUTTON", SWIG_PyObj_FromInt((int)wxDD_NEW_DIR_BUTTON)); + PyDict_SetItemString(d,"DD_DEFAULT_STYLE", SWIG_PyObj_FromInt((int)wxDD_DEFAULT_STYLE)); + PyDict_SetItemString(d,"MENU_TEAROFF", SWIG_PyObj_FromInt((int)wxMENU_TEAROFF)); + PyDict_SetItemString(d,"MB_DOCKABLE", SWIG_PyObj_FromInt((int)wxMB_DOCKABLE)); + PyDict_SetItemString(d,"NO_FULL_REPAINT_ON_RESIZE", SWIG_PyObj_FromInt((int)wxNO_FULL_REPAINT_ON_RESIZE)); + PyDict_SetItemString(d,"FULL_REPAINT_ON_RESIZE", SWIG_PyObj_FromInt((int)wxFULL_REPAINT_ON_RESIZE)); + PyDict_SetItemString(d,"LI_HORIZONTAL", SWIG_PyObj_FromInt((int)wxLI_HORIZONTAL)); + PyDict_SetItemString(d,"LI_VERTICAL", SWIG_PyObj_FromInt((int)wxLI_VERTICAL)); + PyDict_SetItemString(d,"WS_EX_VALIDATE_RECURSIVELY", SWIG_PyObj_FromInt((int)wxWS_EX_VALIDATE_RECURSIVELY)); + PyDict_SetItemString(d,"WS_EX_BLOCK_EVENTS", SWIG_PyObj_FromInt((int)wxWS_EX_BLOCK_EVENTS)); + PyDict_SetItemString(d,"WS_EX_TRANSIENT", SWIG_PyObj_FromInt((int)wxWS_EX_TRANSIENT)); + PyDict_SetItemString(d,"WS_EX_THEMED_BACKGROUND", SWIG_PyObj_FromInt((int)wxWS_EX_THEMED_BACKGROUND)); + PyDict_SetItemString(d,"WS_EX_PROCESS_IDLE", SWIG_PyObj_FromInt((int)wxWS_EX_PROCESS_IDLE)); + PyDict_SetItemString(d,"WS_EX_PROCESS_UI_UPDATES", SWIG_PyObj_FromInt((int)wxWS_EX_PROCESS_UI_UPDATES)); + PyDict_SetItemString(d,"MM_TEXT", SWIG_PyObj_FromInt((int)wxMM_TEXT)); + PyDict_SetItemString(d,"MM_LOMETRIC", SWIG_PyObj_FromInt((int)wxMM_LOMETRIC)); + PyDict_SetItemString(d,"MM_HIMETRIC", SWIG_PyObj_FromInt((int)wxMM_HIMETRIC)); + PyDict_SetItemString(d,"MM_LOENGLISH", SWIG_PyObj_FromInt((int)wxMM_LOENGLISH)); + PyDict_SetItemString(d,"MM_HIENGLISH", SWIG_PyObj_FromInt((int)wxMM_HIENGLISH)); + PyDict_SetItemString(d,"MM_TWIPS", SWIG_PyObj_FromInt((int)wxMM_TWIPS)); + PyDict_SetItemString(d,"MM_ISOTROPIC", SWIG_PyObj_FromInt((int)wxMM_ISOTROPIC)); + PyDict_SetItemString(d,"MM_ANISOTROPIC", SWIG_PyObj_FromInt((int)wxMM_ANISOTROPIC)); + PyDict_SetItemString(d,"MM_POINTS", SWIG_PyObj_FromInt((int)wxMM_POINTS)); + PyDict_SetItemString(d,"MM_METRIC", SWIG_PyObj_FromInt((int)wxMM_METRIC)); + PyDict_SetItemString(d,"CENTRE", SWIG_PyObj_FromInt((int)wxCENTRE)); + PyDict_SetItemString(d,"CENTER", SWIG_PyObj_FromInt((int)wxCENTER)); + PyDict_SetItemString(d,"HORIZONTAL", SWIG_PyObj_FromInt((int)wxHORIZONTAL)); + PyDict_SetItemString(d,"VERTICAL", SWIG_PyObj_FromInt((int)wxVERTICAL)); + PyDict_SetItemString(d,"BOTH", SWIG_PyObj_FromInt((int)wxBOTH)); + PyDict_SetItemString(d,"LEFT", SWIG_PyObj_FromInt((int)wxLEFT)); + PyDict_SetItemString(d,"RIGHT", SWIG_PyObj_FromInt((int)wxRIGHT)); + PyDict_SetItemString(d,"UP", SWIG_PyObj_FromInt((int)wxUP)); + PyDict_SetItemString(d,"DOWN", SWIG_PyObj_FromInt((int)wxDOWN)); + PyDict_SetItemString(d,"TOP", SWIG_PyObj_FromInt((int)wxTOP)); + PyDict_SetItemString(d,"BOTTOM", SWIG_PyObj_FromInt((int)wxBOTTOM)); + PyDict_SetItemString(d,"NORTH", SWIG_PyObj_FromInt((int)wxNORTH)); + PyDict_SetItemString(d,"SOUTH", SWIG_PyObj_FromInt((int)wxSOUTH)); + PyDict_SetItemString(d,"WEST", SWIG_PyObj_FromInt((int)wxWEST)); + PyDict_SetItemString(d,"EAST", SWIG_PyObj_FromInt((int)wxEAST)); + PyDict_SetItemString(d,"ALL", SWIG_PyObj_FromInt((int)wxALL)); + PyDict_SetItemString(d,"ALIGN_NOT", SWIG_PyObj_FromInt((int)wxALIGN_NOT)); + PyDict_SetItemString(d,"ALIGN_CENTER_HORIZONTAL", SWIG_PyObj_FromInt((int)wxALIGN_CENTER_HORIZONTAL)); + PyDict_SetItemString(d,"ALIGN_CENTRE_HORIZONTAL", SWIG_PyObj_FromInt((int)wxALIGN_CENTRE_HORIZONTAL)); + PyDict_SetItemString(d,"ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxALIGN_LEFT)); + PyDict_SetItemString(d,"ALIGN_TOP", SWIG_PyObj_FromInt((int)wxALIGN_TOP)); + PyDict_SetItemString(d,"ALIGN_RIGHT", SWIG_PyObj_FromInt((int)wxALIGN_RIGHT)); + PyDict_SetItemString(d,"ALIGN_BOTTOM", SWIG_PyObj_FromInt((int)wxALIGN_BOTTOM)); + PyDict_SetItemString(d,"ALIGN_CENTER_VERTICAL", SWIG_PyObj_FromInt((int)wxALIGN_CENTER_VERTICAL)); + PyDict_SetItemString(d,"ALIGN_CENTRE_VERTICAL", SWIG_PyObj_FromInt((int)wxALIGN_CENTRE_VERTICAL)); + PyDict_SetItemString(d,"ALIGN_CENTER", SWIG_PyObj_FromInt((int)wxALIGN_CENTER)); + PyDict_SetItemString(d,"ALIGN_CENTRE", SWIG_PyObj_FromInt((int)wxALIGN_CENTRE)); + PyDict_SetItemString(d,"ALIGN_MASK", SWIG_PyObj_FromInt((int)wxALIGN_MASK)); + PyDict_SetItemString(d,"STRETCH_NOT", SWIG_PyObj_FromInt((int)wxSTRETCH_NOT)); + PyDict_SetItemString(d,"SHRINK", SWIG_PyObj_FromInt((int)wxSHRINK)); + PyDict_SetItemString(d,"GROW", SWIG_PyObj_FromInt((int)wxGROW)); + PyDict_SetItemString(d,"EXPAND", SWIG_PyObj_FromInt((int)wxEXPAND)); + PyDict_SetItemString(d,"SHAPED", SWIG_PyObj_FromInt((int)wxSHAPED)); + PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_PyObj_FromInt((int)wxADJUST_MINSIZE)); + PyDict_SetItemString(d,"TILE", SWIG_PyObj_FromInt((int)wxTILE)); + PyDict_SetItemString(d,"BORDER_DEFAULT", SWIG_PyObj_FromInt((int)wxBORDER_DEFAULT)); + PyDict_SetItemString(d,"BORDER_NONE", SWIG_PyObj_FromInt((int)wxBORDER_NONE)); + PyDict_SetItemString(d,"BORDER_STATIC", SWIG_PyObj_FromInt((int)wxBORDER_STATIC)); + PyDict_SetItemString(d,"BORDER_SIMPLE", SWIG_PyObj_FromInt((int)wxBORDER_SIMPLE)); + PyDict_SetItemString(d,"BORDER_RAISED", SWIG_PyObj_FromInt((int)wxBORDER_RAISED)); + PyDict_SetItemString(d,"BORDER_SUNKEN", SWIG_PyObj_FromInt((int)wxBORDER_SUNKEN)); + PyDict_SetItemString(d,"BORDER_DOUBLE", SWIG_PyObj_FromInt((int)wxBORDER_DOUBLE)); + PyDict_SetItemString(d,"BORDER_MASK", SWIG_PyObj_FromInt((int)wxBORDER_MASK)); + PyDict_SetItemString(d,"DEFAULT", SWIG_PyObj_FromInt((int)wxDEFAULT)); + PyDict_SetItemString(d,"DECORATIVE", SWIG_PyObj_FromInt((int)wxDECORATIVE)); + PyDict_SetItemString(d,"ROMAN", SWIG_PyObj_FromInt((int)wxROMAN)); + PyDict_SetItemString(d,"SCRIPT", SWIG_PyObj_FromInt((int)wxSCRIPT)); + PyDict_SetItemString(d,"SWISS", SWIG_PyObj_FromInt((int)wxSWISS)); + PyDict_SetItemString(d,"MODERN", SWIG_PyObj_FromInt((int)wxMODERN)); + PyDict_SetItemString(d,"TELETYPE", SWIG_PyObj_FromInt((int)wxTELETYPE)); + PyDict_SetItemString(d,"VARIABLE", SWIG_PyObj_FromInt((int)wxVARIABLE)); + PyDict_SetItemString(d,"FIXED", SWIG_PyObj_FromInt((int)wxFIXED)); + PyDict_SetItemString(d,"NORMAL", SWIG_PyObj_FromInt((int)wxNORMAL)); + PyDict_SetItemString(d,"LIGHT", SWIG_PyObj_FromInt((int)wxLIGHT)); + PyDict_SetItemString(d,"BOLD", SWIG_PyObj_FromInt((int)wxBOLD)); + PyDict_SetItemString(d,"ITALIC", SWIG_PyObj_FromInt((int)wxITALIC)); + PyDict_SetItemString(d,"SLANT", SWIG_PyObj_FromInt((int)wxSLANT)); + PyDict_SetItemString(d,"SOLID", SWIG_PyObj_FromInt((int)wxSOLID)); + PyDict_SetItemString(d,"DOT", SWIG_PyObj_FromInt((int)wxDOT)); + PyDict_SetItemString(d,"LONG_DASH", SWIG_PyObj_FromInt((int)wxLONG_DASH)); + PyDict_SetItemString(d,"SHORT_DASH", SWIG_PyObj_FromInt((int)wxSHORT_DASH)); + PyDict_SetItemString(d,"DOT_DASH", SWIG_PyObj_FromInt((int)wxDOT_DASH)); + PyDict_SetItemString(d,"USER_DASH", SWIG_PyObj_FromInt((int)wxUSER_DASH)); + PyDict_SetItemString(d,"TRANSPARENT", SWIG_PyObj_FromInt((int)wxTRANSPARENT)); + PyDict_SetItemString(d,"STIPPLE", SWIG_PyObj_FromInt((int)wxSTIPPLE)); + PyDict_SetItemString(d,"BDIAGONAL_HATCH", SWIG_PyObj_FromInt((int)wxBDIAGONAL_HATCH)); + PyDict_SetItemString(d,"CROSSDIAG_HATCH", SWIG_PyObj_FromInt((int)wxCROSSDIAG_HATCH)); + PyDict_SetItemString(d,"FDIAGONAL_HATCH", SWIG_PyObj_FromInt((int)wxFDIAGONAL_HATCH)); + PyDict_SetItemString(d,"CROSS_HATCH", SWIG_PyObj_FromInt((int)wxCROSS_HATCH)); + PyDict_SetItemString(d,"HORIZONTAL_HATCH", SWIG_PyObj_FromInt((int)wxHORIZONTAL_HATCH)); + PyDict_SetItemString(d,"VERTICAL_HATCH", SWIG_PyObj_FromInt((int)wxVERTICAL_HATCH)); + PyDict_SetItemString(d,"JOIN_BEVEL", SWIG_PyObj_FromInt((int)wxJOIN_BEVEL)); + PyDict_SetItemString(d,"JOIN_MITER", SWIG_PyObj_FromInt((int)wxJOIN_MITER)); + PyDict_SetItemString(d,"JOIN_ROUND", SWIG_PyObj_FromInt((int)wxJOIN_ROUND)); + PyDict_SetItemString(d,"CAP_ROUND", SWIG_PyObj_FromInt((int)wxCAP_ROUND)); + PyDict_SetItemString(d,"CAP_PROJECTING", SWIG_PyObj_FromInt((int)wxCAP_PROJECTING)); + PyDict_SetItemString(d,"CAP_BUTT", SWIG_PyObj_FromInt((int)wxCAP_BUTT)); + PyDict_SetItemString(d,"CLEAR", SWIG_PyObj_FromInt((int)wxCLEAR)); + PyDict_SetItemString(d,"XOR", SWIG_PyObj_FromInt((int)wxXOR)); + PyDict_SetItemString(d,"INVERT", SWIG_PyObj_FromInt((int)wxINVERT)); + PyDict_SetItemString(d,"OR_REVERSE", SWIG_PyObj_FromInt((int)wxOR_REVERSE)); + PyDict_SetItemString(d,"AND_REVERSE", SWIG_PyObj_FromInt((int)wxAND_REVERSE)); + PyDict_SetItemString(d,"COPY", SWIG_PyObj_FromInt((int)wxCOPY)); + PyDict_SetItemString(d,"AND", SWIG_PyObj_FromInt((int)wxAND)); + PyDict_SetItemString(d,"AND_INVERT", SWIG_PyObj_FromInt((int)wxAND_INVERT)); + PyDict_SetItemString(d,"NO_OP", SWIG_PyObj_FromInt((int)wxNO_OP)); + PyDict_SetItemString(d,"NOR", SWIG_PyObj_FromInt((int)wxNOR)); + PyDict_SetItemString(d,"EQUIV", SWIG_PyObj_FromInt((int)wxEQUIV)); + PyDict_SetItemString(d,"SRC_INVERT", SWIG_PyObj_FromInt((int)wxSRC_INVERT)); + PyDict_SetItemString(d,"OR_INVERT", SWIG_PyObj_FromInt((int)wxOR_INVERT)); + PyDict_SetItemString(d,"NAND", SWIG_PyObj_FromInt((int)wxNAND)); + PyDict_SetItemString(d,"OR", SWIG_PyObj_FromInt((int)wxOR)); + PyDict_SetItemString(d,"SET", SWIG_PyObj_FromInt((int)wxSET)); + PyDict_SetItemString(d,"WXK_BACK", SWIG_PyObj_FromInt((int)WXK_BACK)); + PyDict_SetItemString(d,"WXK_TAB", SWIG_PyObj_FromInt((int)WXK_TAB)); + PyDict_SetItemString(d,"WXK_RETURN", SWIG_PyObj_FromInt((int)WXK_RETURN)); + PyDict_SetItemString(d,"WXK_ESCAPE", SWIG_PyObj_FromInt((int)WXK_ESCAPE)); + PyDict_SetItemString(d,"WXK_SPACE", SWIG_PyObj_FromInt((int)WXK_SPACE)); + PyDict_SetItemString(d,"WXK_DELETE", SWIG_PyObj_FromInt((int)WXK_DELETE)); + PyDict_SetItemString(d,"WXK_START", SWIG_PyObj_FromInt((int)WXK_START)); + PyDict_SetItemString(d,"WXK_LBUTTON", SWIG_PyObj_FromInt((int)WXK_LBUTTON)); + PyDict_SetItemString(d,"WXK_RBUTTON", SWIG_PyObj_FromInt((int)WXK_RBUTTON)); + PyDict_SetItemString(d,"WXK_CANCEL", SWIG_PyObj_FromInt((int)WXK_CANCEL)); + PyDict_SetItemString(d,"WXK_MBUTTON", SWIG_PyObj_FromInt((int)WXK_MBUTTON)); + PyDict_SetItemString(d,"WXK_CLEAR", SWIG_PyObj_FromInt((int)WXK_CLEAR)); + PyDict_SetItemString(d,"WXK_SHIFT", SWIG_PyObj_FromInt((int)WXK_SHIFT)); + PyDict_SetItemString(d,"WXK_ALT", SWIG_PyObj_FromInt((int)WXK_ALT)); + PyDict_SetItemString(d,"WXK_CONTROL", SWIG_PyObj_FromInt((int)WXK_CONTROL)); + PyDict_SetItemString(d,"WXK_MENU", SWIG_PyObj_FromInt((int)WXK_MENU)); + PyDict_SetItemString(d,"WXK_PAUSE", SWIG_PyObj_FromInt((int)WXK_PAUSE)); + PyDict_SetItemString(d,"WXK_CAPITAL", SWIG_PyObj_FromInt((int)WXK_CAPITAL)); + PyDict_SetItemString(d,"WXK_PRIOR", SWIG_PyObj_FromInt((int)WXK_PRIOR)); + PyDict_SetItemString(d,"WXK_NEXT", SWIG_PyObj_FromInt((int)WXK_NEXT)); + PyDict_SetItemString(d,"WXK_END", SWIG_PyObj_FromInt((int)WXK_END)); + PyDict_SetItemString(d,"WXK_HOME", SWIG_PyObj_FromInt((int)WXK_HOME)); + PyDict_SetItemString(d,"WXK_LEFT", SWIG_PyObj_FromInt((int)WXK_LEFT)); + PyDict_SetItemString(d,"WXK_UP", SWIG_PyObj_FromInt((int)WXK_UP)); + PyDict_SetItemString(d,"WXK_RIGHT", SWIG_PyObj_FromInt((int)WXK_RIGHT)); + PyDict_SetItemString(d,"WXK_DOWN", SWIG_PyObj_FromInt((int)WXK_DOWN)); + PyDict_SetItemString(d,"WXK_SELECT", SWIG_PyObj_FromInt((int)WXK_SELECT)); + PyDict_SetItemString(d,"WXK_PRINT", SWIG_PyObj_FromInt((int)WXK_PRINT)); + PyDict_SetItemString(d,"WXK_EXECUTE", SWIG_PyObj_FromInt((int)WXK_EXECUTE)); + PyDict_SetItemString(d,"WXK_SNAPSHOT", SWIG_PyObj_FromInt((int)WXK_SNAPSHOT)); + PyDict_SetItemString(d,"WXK_INSERT", SWIG_PyObj_FromInt((int)WXK_INSERT)); + PyDict_SetItemString(d,"WXK_HELP", SWIG_PyObj_FromInt((int)WXK_HELP)); + PyDict_SetItemString(d,"WXK_NUMPAD0", SWIG_PyObj_FromInt((int)WXK_NUMPAD0)); + PyDict_SetItemString(d,"WXK_NUMPAD1", SWIG_PyObj_FromInt((int)WXK_NUMPAD1)); + PyDict_SetItemString(d,"WXK_NUMPAD2", SWIG_PyObj_FromInt((int)WXK_NUMPAD2)); + PyDict_SetItemString(d,"WXK_NUMPAD3", SWIG_PyObj_FromInt((int)WXK_NUMPAD3)); + PyDict_SetItemString(d,"WXK_NUMPAD4", SWIG_PyObj_FromInt((int)WXK_NUMPAD4)); + PyDict_SetItemString(d,"WXK_NUMPAD5", SWIG_PyObj_FromInt((int)WXK_NUMPAD5)); + PyDict_SetItemString(d,"WXK_NUMPAD6", SWIG_PyObj_FromInt((int)WXK_NUMPAD6)); + PyDict_SetItemString(d,"WXK_NUMPAD7", SWIG_PyObj_FromInt((int)WXK_NUMPAD7)); + PyDict_SetItemString(d,"WXK_NUMPAD8", SWIG_PyObj_FromInt((int)WXK_NUMPAD8)); + PyDict_SetItemString(d,"WXK_NUMPAD9", SWIG_PyObj_FromInt((int)WXK_NUMPAD9)); + PyDict_SetItemString(d,"WXK_MULTIPLY", SWIG_PyObj_FromInt((int)WXK_MULTIPLY)); + PyDict_SetItemString(d,"WXK_ADD", SWIG_PyObj_FromInt((int)WXK_ADD)); + PyDict_SetItemString(d,"WXK_SEPARATOR", SWIG_PyObj_FromInt((int)WXK_SEPARATOR)); + PyDict_SetItemString(d,"WXK_SUBTRACT", SWIG_PyObj_FromInt((int)WXK_SUBTRACT)); + PyDict_SetItemString(d,"WXK_DECIMAL", SWIG_PyObj_FromInt((int)WXK_DECIMAL)); + PyDict_SetItemString(d,"WXK_DIVIDE", SWIG_PyObj_FromInt((int)WXK_DIVIDE)); + PyDict_SetItemString(d,"WXK_F1", SWIG_PyObj_FromInt((int)WXK_F1)); + PyDict_SetItemString(d,"WXK_F2", SWIG_PyObj_FromInt((int)WXK_F2)); + PyDict_SetItemString(d,"WXK_F3", SWIG_PyObj_FromInt((int)WXK_F3)); + PyDict_SetItemString(d,"WXK_F4", SWIG_PyObj_FromInt((int)WXK_F4)); + PyDict_SetItemString(d,"WXK_F5", SWIG_PyObj_FromInt((int)WXK_F5)); + PyDict_SetItemString(d,"WXK_F6", SWIG_PyObj_FromInt((int)WXK_F6)); + PyDict_SetItemString(d,"WXK_F7", SWIG_PyObj_FromInt((int)WXK_F7)); + PyDict_SetItemString(d,"WXK_F8", SWIG_PyObj_FromInt((int)WXK_F8)); + PyDict_SetItemString(d,"WXK_F9", SWIG_PyObj_FromInt((int)WXK_F9)); + PyDict_SetItemString(d,"WXK_F10", SWIG_PyObj_FromInt((int)WXK_F10)); + PyDict_SetItemString(d,"WXK_F11", SWIG_PyObj_FromInt((int)WXK_F11)); + PyDict_SetItemString(d,"WXK_F12", SWIG_PyObj_FromInt((int)WXK_F12)); + PyDict_SetItemString(d,"WXK_F13", SWIG_PyObj_FromInt((int)WXK_F13)); + PyDict_SetItemString(d,"WXK_F14", SWIG_PyObj_FromInt((int)WXK_F14)); + PyDict_SetItemString(d,"WXK_F15", SWIG_PyObj_FromInt((int)WXK_F15)); + PyDict_SetItemString(d,"WXK_F16", SWIG_PyObj_FromInt((int)WXK_F16)); + PyDict_SetItemString(d,"WXK_F17", SWIG_PyObj_FromInt((int)WXK_F17)); + PyDict_SetItemString(d,"WXK_F18", SWIG_PyObj_FromInt((int)WXK_F18)); + PyDict_SetItemString(d,"WXK_F19", SWIG_PyObj_FromInt((int)WXK_F19)); + PyDict_SetItemString(d,"WXK_F20", SWIG_PyObj_FromInt((int)WXK_F20)); + PyDict_SetItemString(d,"WXK_F21", SWIG_PyObj_FromInt((int)WXK_F21)); + PyDict_SetItemString(d,"WXK_F22", SWIG_PyObj_FromInt((int)WXK_F22)); + PyDict_SetItemString(d,"WXK_F23", SWIG_PyObj_FromInt((int)WXK_F23)); + PyDict_SetItemString(d,"WXK_F24", SWIG_PyObj_FromInt((int)WXK_F24)); + PyDict_SetItemString(d,"WXK_NUMLOCK", SWIG_PyObj_FromInt((int)WXK_NUMLOCK)); + PyDict_SetItemString(d,"WXK_SCROLL", SWIG_PyObj_FromInt((int)WXK_SCROLL)); + PyDict_SetItemString(d,"WXK_PAGEUP", SWIG_PyObj_FromInt((int)WXK_PAGEUP)); + PyDict_SetItemString(d,"WXK_PAGEDOWN", SWIG_PyObj_FromInt((int)WXK_PAGEDOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_SPACE", SWIG_PyObj_FromInt((int)WXK_NUMPAD_SPACE)); + PyDict_SetItemString(d,"WXK_NUMPAD_TAB", SWIG_PyObj_FromInt((int)WXK_NUMPAD_TAB)); + PyDict_SetItemString(d,"WXK_NUMPAD_ENTER", SWIG_PyObj_FromInt((int)WXK_NUMPAD_ENTER)); + PyDict_SetItemString(d,"WXK_NUMPAD_F1", SWIG_PyObj_FromInt((int)WXK_NUMPAD_F1)); + PyDict_SetItemString(d,"WXK_NUMPAD_F2", SWIG_PyObj_FromInt((int)WXK_NUMPAD_F2)); + PyDict_SetItemString(d,"WXK_NUMPAD_F3", SWIG_PyObj_FromInt((int)WXK_NUMPAD_F3)); + PyDict_SetItemString(d,"WXK_NUMPAD_F4", SWIG_PyObj_FromInt((int)WXK_NUMPAD_F4)); + PyDict_SetItemString(d,"WXK_NUMPAD_HOME", SWIG_PyObj_FromInt((int)WXK_NUMPAD_HOME)); + PyDict_SetItemString(d,"WXK_NUMPAD_LEFT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_LEFT)); + PyDict_SetItemString(d,"WXK_NUMPAD_UP", SWIG_PyObj_FromInt((int)WXK_NUMPAD_UP)); + PyDict_SetItemString(d,"WXK_NUMPAD_RIGHT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_RIGHT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DOWN", SWIG_PyObj_FromInt((int)WXK_NUMPAD_DOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_PRIOR", SWIG_PyObj_FromInt((int)WXK_NUMPAD_PRIOR)); + PyDict_SetItemString(d,"WXK_NUMPAD_PAGEUP", SWIG_PyObj_FromInt((int)WXK_NUMPAD_PAGEUP)); + PyDict_SetItemString(d,"WXK_NUMPAD_NEXT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_NEXT)); + PyDict_SetItemString(d,"WXK_NUMPAD_PAGEDOWN", SWIG_PyObj_FromInt((int)WXK_NUMPAD_PAGEDOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_END", SWIG_PyObj_FromInt((int)WXK_NUMPAD_END)); + PyDict_SetItemString(d,"WXK_NUMPAD_BEGIN", SWIG_PyObj_FromInt((int)WXK_NUMPAD_BEGIN)); + PyDict_SetItemString(d,"WXK_NUMPAD_INSERT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_INSERT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DELETE", SWIG_PyObj_FromInt((int)WXK_NUMPAD_DELETE)); + PyDict_SetItemString(d,"WXK_NUMPAD_EQUAL", SWIG_PyObj_FromInt((int)WXK_NUMPAD_EQUAL)); + PyDict_SetItemString(d,"WXK_NUMPAD_MULTIPLY", SWIG_PyObj_FromInt((int)WXK_NUMPAD_MULTIPLY)); + PyDict_SetItemString(d,"WXK_NUMPAD_ADD", SWIG_PyObj_FromInt((int)WXK_NUMPAD_ADD)); + PyDict_SetItemString(d,"WXK_NUMPAD_SEPARATOR", SWIG_PyObj_FromInt((int)WXK_NUMPAD_SEPARATOR)); + PyDict_SetItemString(d,"WXK_NUMPAD_SUBTRACT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_SUBTRACT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DECIMAL", SWIG_PyObj_FromInt((int)WXK_NUMPAD_DECIMAL)); + PyDict_SetItemString(d,"WXK_NUMPAD_DIVIDE", SWIG_PyObj_FromInt((int)WXK_NUMPAD_DIVIDE)); + PyDict_SetItemString(d,"WXK_WINDOWS_LEFT", SWIG_PyObj_FromInt((int)WXK_WINDOWS_LEFT)); + PyDict_SetItemString(d,"WXK_WINDOWS_RIGHT", SWIG_PyObj_FromInt((int)WXK_WINDOWS_RIGHT)); + PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_PyObj_FromInt((int)WXK_WINDOWS_MENU)); + PyDict_SetItemString(d,"PAPER_NONE", SWIG_PyObj_FromInt((int)wxPAPER_NONE)); + PyDict_SetItemString(d,"PAPER_LETTER", SWIG_PyObj_FromInt((int)wxPAPER_LETTER)); + PyDict_SetItemString(d,"PAPER_LEGAL", SWIG_PyObj_FromInt((int)wxPAPER_LEGAL)); + PyDict_SetItemString(d,"PAPER_A4", SWIG_PyObj_FromInt((int)wxPAPER_A4)); + PyDict_SetItemString(d,"PAPER_CSHEET", SWIG_PyObj_FromInt((int)wxPAPER_CSHEET)); + PyDict_SetItemString(d,"PAPER_DSHEET", SWIG_PyObj_FromInt((int)wxPAPER_DSHEET)); + PyDict_SetItemString(d,"PAPER_ESHEET", SWIG_PyObj_FromInt((int)wxPAPER_ESHEET)); + PyDict_SetItemString(d,"PAPER_LETTERSMALL", SWIG_PyObj_FromInt((int)wxPAPER_LETTERSMALL)); + PyDict_SetItemString(d,"PAPER_TABLOID", SWIG_PyObj_FromInt((int)wxPAPER_TABLOID)); + PyDict_SetItemString(d,"PAPER_LEDGER", SWIG_PyObj_FromInt((int)wxPAPER_LEDGER)); + PyDict_SetItemString(d,"PAPER_STATEMENT", SWIG_PyObj_FromInt((int)wxPAPER_STATEMENT)); + PyDict_SetItemString(d,"PAPER_EXECUTIVE", SWIG_PyObj_FromInt((int)wxPAPER_EXECUTIVE)); + PyDict_SetItemString(d,"PAPER_A3", SWIG_PyObj_FromInt((int)wxPAPER_A3)); + PyDict_SetItemString(d,"PAPER_A4SMALL", SWIG_PyObj_FromInt((int)wxPAPER_A4SMALL)); + PyDict_SetItemString(d,"PAPER_A5", SWIG_PyObj_FromInt((int)wxPAPER_A5)); + PyDict_SetItemString(d,"PAPER_B4", SWIG_PyObj_FromInt((int)wxPAPER_B4)); + PyDict_SetItemString(d,"PAPER_B5", SWIG_PyObj_FromInt((int)wxPAPER_B5)); + PyDict_SetItemString(d,"PAPER_FOLIO", SWIG_PyObj_FromInt((int)wxPAPER_FOLIO)); + PyDict_SetItemString(d,"PAPER_QUARTO", SWIG_PyObj_FromInt((int)wxPAPER_QUARTO)); + PyDict_SetItemString(d,"PAPER_10X14", SWIG_PyObj_FromInt((int)wxPAPER_10X14)); + PyDict_SetItemString(d,"PAPER_11X17", SWIG_PyObj_FromInt((int)wxPAPER_11X17)); + PyDict_SetItemString(d,"PAPER_NOTE", SWIG_PyObj_FromInt((int)wxPAPER_NOTE)); + PyDict_SetItemString(d,"PAPER_ENV_9", SWIG_PyObj_FromInt((int)wxPAPER_ENV_9)); + PyDict_SetItemString(d,"PAPER_ENV_10", SWIG_PyObj_FromInt((int)wxPAPER_ENV_10)); + PyDict_SetItemString(d,"PAPER_ENV_11", SWIG_PyObj_FromInt((int)wxPAPER_ENV_11)); + PyDict_SetItemString(d,"PAPER_ENV_12", SWIG_PyObj_FromInt((int)wxPAPER_ENV_12)); + PyDict_SetItemString(d,"PAPER_ENV_14", SWIG_PyObj_FromInt((int)wxPAPER_ENV_14)); + PyDict_SetItemString(d,"PAPER_ENV_DL", SWIG_PyObj_FromInt((int)wxPAPER_ENV_DL)); + PyDict_SetItemString(d,"PAPER_ENV_C5", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C5)); + PyDict_SetItemString(d,"PAPER_ENV_C3", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C3)); + PyDict_SetItemString(d,"PAPER_ENV_C4", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C4)); + PyDict_SetItemString(d,"PAPER_ENV_C6", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C6)); + PyDict_SetItemString(d,"PAPER_ENV_C65", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C65)); + PyDict_SetItemString(d,"PAPER_ENV_B4", SWIG_PyObj_FromInt((int)wxPAPER_ENV_B4)); + PyDict_SetItemString(d,"PAPER_ENV_B5", SWIG_PyObj_FromInt((int)wxPAPER_ENV_B5)); + PyDict_SetItemString(d,"PAPER_ENV_B6", SWIG_PyObj_FromInt((int)wxPAPER_ENV_B6)); + PyDict_SetItemString(d,"PAPER_ENV_ITALY", SWIG_PyObj_FromInt((int)wxPAPER_ENV_ITALY)); + PyDict_SetItemString(d,"PAPER_ENV_MONARCH", SWIG_PyObj_FromInt((int)wxPAPER_ENV_MONARCH)); + PyDict_SetItemString(d,"PAPER_ENV_PERSONAL", SWIG_PyObj_FromInt((int)wxPAPER_ENV_PERSONAL)); + PyDict_SetItemString(d,"PAPER_FANFOLD_US", SWIG_PyObj_FromInt((int)wxPAPER_FANFOLD_US)); + PyDict_SetItemString(d,"PAPER_FANFOLD_STD_GERMAN", SWIG_PyObj_FromInt((int)wxPAPER_FANFOLD_STD_GERMAN)); + PyDict_SetItemString(d,"PAPER_FANFOLD_LGL_GERMAN", SWIG_PyObj_FromInt((int)wxPAPER_FANFOLD_LGL_GERMAN)); + PyDict_SetItemString(d,"PAPER_ISO_B4", SWIG_PyObj_FromInt((int)wxPAPER_ISO_B4)); + PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD", SWIG_PyObj_FromInt((int)wxPAPER_JAPANESE_POSTCARD)); + PyDict_SetItemString(d,"PAPER_9X11", SWIG_PyObj_FromInt((int)wxPAPER_9X11)); + PyDict_SetItemString(d,"PAPER_10X11", SWIG_PyObj_FromInt((int)wxPAPER_10X11)); + PyDict_SetItemString(d,"PAPER_15X11", SWIG_PyObj_FromInt((int)wxPAPER_15X11)); + PyDict_SetItemString(d,"PAPER_ENV_INVITE", SWIG_PyObj_FromInt((int)wxPAPER_ENV_INVITE)); + PyDict_SetItemString(d,"PAPER_LETTER_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_LETTER_EXTRA)); + PyDict_SetItemString(d,"PAPER_LEGAL_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_LEGAL_EXTRA)); + PyDict_SetItemString(d,"PAPER_TABLOID_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_TABLOID_EXTRA)); + PyDict_SetItemString(d,"PAPER_A4_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_A4_EXTRA)); + PyDict_SetItemString(d,"PAPER_LETTER_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_LETTER_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A4_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_A4_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_LETTER_EXTRA_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_LETTER_EXTRA_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A_PLUS", SWIG_PyObj_FromInt((int)wxPAPER_A_PLUS)); + PyDict_SetItemString(d,"PAPER_B_PLUS", SWIG_PyObj_FromInt((int)wxPAPER_B_PLUS)); + PyDict_SetItemString(d,"PAPER_LETTER_PLUS", SWIG_PyObj_FromInt((int)wxPAPER_LETTER_PLUS)); + PyDict_SetItemString(d,"PAPER_A4_PLUS", SWIG_PyObj_FromInt((int)wxPAPER_A4_PLUS)); + PyDict_SetItemString(d,"PAPER_A5_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_A5_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_B5_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_B5_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A3_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_A3_EXTRA)); + PyDict_SetItemString(d,"PAPER_A5_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_A5_EXTRA)); + PyDict_SetItemString(d,"PAPER_B5_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_B5_EXTRA)); + PyDict_SetItemString(d,"PAPER_A2", SWIG_PyObj_FromInt((int)wxPAPER_A2)); + PyDict_SetItemString(d,"PAPER_A3_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_A3_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_A3_EXTRA_TRANSVERSE)); + PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_PyObj_FromInt((int)wxDUPLEX_SIMPLEX)); + PyDict_SetItemString(d,"DUPLEX_HORIZONTAL", SWIG_PyObj_FromInt((int)wxDUPLEX_HORIZONTAL)); + PyDict_SetItemString(d,"DUPLEX_VERTICAL", SWIG_PyObj_FromInt((int)wxDUPLEX_VERTICAL)); + PyDict_SetItemString(d,"ITEM_SEPARATOR", SWIG_PyObj_FromInt((int)wxITEM_SEPARATOR)); + PyDict_SetItemString(d,"ITEM_NORMAL", SWIG_PyObj_FromInt((int)wxITEM_NORMAL)); + PyDict_SetItemString(d,"ITEM_CHECK", SWIG_PyObj_FromInt((int)wxITEM_CHECK)); + PyDict_SetItemString(d,"ITEM_RADIO", SWIG_PyObj_FromInt((int)wxITEM_RADIO)); + PyDict_SetItemString(d,"ITEM_MAX", SWIG_PyObj_FromInt((int)wxITEM_MAX)); + PyDict_SetItemString(d,"HT_NOWHERE", SWIG_PyObj_FromInt((int)wxHT_NOWHERE)); + PyDict_SetItemString(d,"HT_SCROLLBAR_FIRST", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_FIRST)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_1", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_ARROW_LINE_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_2", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_ARROW_LINE_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_1", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_ARROW_PAGE_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_2", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_ARROW_PAGE_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_THUMB", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_THUMB)); + PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_1", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_BAR_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_2", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_BAR_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_LAST", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_LAST)); + PyDict_SetItemString(d,"HT_WINDOW_OUTSIDE", SWIG_PyObj_FromInt((int)wxHT_WINDOW_OUTSIDE)); + PyDict_SetItemString(d,"HT_WINDOW_INSIDE", SWIG_PyObj_FromInt((int)wxHT_WINDOW_INSIDE)); + PyDict_SetItemString(d,"HT_WINDOW_VERT_SCROLLBAR", SWIG_PyObj_FromInt((int)wxHT_WINDOW_VERT_SCROLLBAR)); + PyDict_SetItemString(d,"HT_WINDOW_HORZ_SCROLLBAR", SWIG_PyObj_FromInt((int)wxHT_WINDOW_HORZ_SCROLLBAR)); + PyDict_SetItemString(d,"HT_WINDOW_CORNER", SWIG_PyObj_FromInt((int)wxHT_WINDOW_CORNER)); + PyDict_SetItemString(d,"HT_MAX", SWIG_PyObj_FromInt((int)wxHT_MAX)); + PyDict_SetItemString(d,"MOD_NONE", SWIG_PyObj_FromInt((int)wxMOD_NONE)); + PyDict_SetItemString(d,"MOD_ALT", SWIG_PyObj_FromInt((int)wxMOD_ALT)); + PyDict_SetItemString(d,"MOD_CONTROL", SWIG_PyObj_FromInt((int)wxMOD_CONTROL)); + PyDict_SetItemString(d,"MOD_SHIFT", SWIG_PyObj_FromInt((int)wxMOD_SHIFT)); + PyDict_SetItemString(d,"MOD_WIN", SWIG_PyObj_FromInt((int)wxMOD_WIN)); + PyDict_SetItemString(d,"UPDATE_UI_NONE", SWIG_PyObj_FromInt((int)wxUPDATE_UI_NONE)); + PyDict_SetItemString(d,"UPDATE_UI_RECURSE", SWIG_PyObj_FromInt((int)wxUPDATE_UI_RECURSE)); + PyDict_SetItemString(d,"UPDATE_UI_FROMIDLE", SWIG_PyObj_FromInt((int)wxUPDATE_UI_FROMIDLE)); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set); + PyDict_SetItemString(d,"BITMAP_TYPE_INVALID", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_INVALID)); + PyDict_SetItemString(d,"BITMAP_TYPE_BMP", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_BMP)); + PyDict_SetItemString(d,"BITMAP_TYPE_ICO", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_ICO)); + PyDict_SetItemString(d,"BITMAP_TYPE_CUR", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_CUR)); + PyDict_SetItemString(d,"BITMAP_TYPE_XBM", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_XBM)); + PyDict_SetItemString(d,"BITMAP_TYPE_XBM_DATA", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_XBM_DATA)); + PyDict_SetItemString(d,"BITMAP_TYPE_XPM", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_XPM)); + PyDict_SetItemString(d,"BITMAP_TYPE_XPM_DATA", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_XPM_DATA)); + PyDict_SetItemString(d,"BITMAP_TYPE_TIF", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_TIF)); + PyDict_SetItemString(d,"BITMAP_TYPE_GIF", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_GIF)); + PyDict_SetItemString(d,"BITMAP_TYPE_PNG", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_PNG)); + PyDict_SetItemString(d,"BITMAP_TYPE_JPEG", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_JPEG)); + PyDict_SetItemString(d,"BITMAP_TYPE_PNM", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_PNM)); + PyDict_SetItemString(d,"BITMAP_TYPE_PCX", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_PCX)); + PyDict_SetItemString(d,"BITMAP_TYPE_PICT", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_PICT)); + PyDict_SetItemString(d,"BITMAP_TYPE_ICON", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_ICON)); + PyDict_SetItemString(d,"BITMAP_TYPE_ANI", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_ANI)); + PyDict_SetItemString(d,"BITMAP_TYPE_IFF", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_IFF)); + PyDict_SetItemString(d,"BITMAP_TYPE_MACCURSOR", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_MACCURSOR)); + PyDict_SetItemString(d,"BITMAP_TYPE_ANY", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_ANY)); + PyDict_SetItemString(d,"CURSOR_NONE", SWIG_PyObj_FromInt((int)wxCURSOR_NONE)); + PyDict_SetItemString(d,"CURSOR_ARROW", SWIG_PyObj_FromInt((int)wxCURSOR_ARROW)); + PyDict_SetItemString(d,"CURSOR_RIGHT_ARROW", SWIG_PyObj_FromInt((int)wxCURSOR_RIGHT_ARROW)); + PyDict_SetItemString(d,"CURSOR_BULLSEYE", SWIG_PyObj_FromInt((int)wxCURSOR_BULLSEYE)); + PyDict_SetItemString(d,"CURSOR_CHAR", SWIG_PyObj_FromInt((int)wxCURSOR_CHAR)); + PyDict_SetItemString(d,"CURSOR_CROSS", SWIG_PyObj_FromInt((int)wxCURSOR_CROSS)); + PyDict_SetItemString(d,"CURSOR_HAND", SWIG_PyObj_FromInt((int)wxCURSOR_HAND)); + PyDict_SetItemString(d,"CURSOR_IBEAM", SWIG_PyObj_FromInt((int)wxCURSOR_IBEAM)); + PyDict_SetItemString(d,"CURSOR_LEFT_BUTTON", SWIG_PyObj_FromInt((int)wxCURSOR_LEFT_BUTTON)); + PyDict_SetItemString(d,"CURSOR_MAGNIFIER", SWIG_PyObj_FromInt((int)wxCURSOR_MAGNIFIER)); + PyDict_SetItemString(d,"CURSOR_MIDDLE_BUTTON", SWIG_PyObj_FromInt((int)wxCURSOR_MIDDLE_BUTTON)); + PyDict_SetItemString(d,"CURSOR_NO_ENTRY", SWIG_PyObj_FromInt((int)wxCURSOR_NO_ENTRY)); + PyDict_SetItemString(d,"CURSOR_PAINT_BRUSH", SWIG_PyObj_FromInt((int)wxCURSOR_PAINT_BRUSH)); + PyDict_SetItemString(d,"CURSOR_PENCIL", SWIG_PyObj_FromInt((int)wxCURSOR_PENCIL)); + PyDict_SetItemString(d,"CURSOR_POINT_LEFT", SWIG_PyObj_FromInt((int)wxCURSOR_POINT_LEFT)); + PyDict_SetItemString(d,"CURSOR_POINT_RIGHT", SWIG_PyObj_FromInt((int)wxCURSOR_POINT_RIGHT)); + PyDict_SetItemString(d,"CURSOR_QUESTION_ARROW", SWIG_PyObj_FromInt((int)wxCURSOR_QUESTION_ARROW)); + PyDict_SetItemString(d,"CURSOR_RIGHT_BUTTON", SWIG_PyObj_FromInt((int)wxCURSOR_RIGHT_BUTTON)); + PyDict_SetItemString(d,"CURSOR_SIZENESW", SWIG_PyObj_FromInt((int)wxCURSOR_SIZENESW)); + PyDict_SetItemString(d,"CURSOR_SIZENS", SWIG_PyObj_FromInt((int)wxCURSOR_SIZENS)); + PyDict_SetItemString(d,"CURSOR_SIZENWSE", SWIG_PyObj_FromInt((int)wxCURSOR_SIZENWSE)); + PyDict_SetItemString(d,"CURSOR_SIZEWE", SWIG_PyObj_FromInt((int)wxCURSOR_SIZEWE)); + PyDict_SetItemString(d,"CURSOR_SIZING", SWIG_PyObj_FromInt((int)wxCURSOR_SIZING)); + PyDict_SetItemString(d,"CURSOR_SPRAYCAN", SWIG_PyObj_FromInt((int)wxCURSOR_SPRAYCAN)); + PyDict_SetItemString(d,"CURSOR_WAIT", SWIG_PyObj_FromInt((int)wxCURSOR_WAIT)); + PyDict_SetItemString(d,"CURSOR_WATCH", SWIG_PyObj_FromInt((int)wxCURSOR_WATCH)); + PyDict_SetItemString(d,"CURSOR_BLANK", SWIG_PyObj_FromInt((int)wxCURSOR_BLANK)); + PyDict_SetItemString(d,"CURSOR_DEFAULT", SWIG_PyObj_FromInt((int)wxCURSOR_DEFAULT)); + PyDict_SetItemString(d,"CURSOR_COPY_ARROW", SWIG_PyObj_FromInt((int)wxCURSOR_COPY_ARROW)); + PyDict_SetItemString(d,"CURSOR_ARROWWAIT", SWIG_PyObj_FromInt((int)wxCURSOR_ARROWWAIT)); + PyDict_SetItemString(d,"CURSOR_MAX", SWIG_PyObj_FromInt((int)wxCURSOR_MAX)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set); + PyDict_SetItemString(d,"FromStart", SWIG_PyObj_FromInt((int)wxFromStart)); + PyDict_SetItemString(d,"FromCurrent", SWIG_PyObj_FromInt((int)wxFromCurrent)); + PyDict_SetItemString(d,"FromEnd", SWIG_PyObj_FromInt((int)wxFromEnd)); wxPyPtrTypeMap_Add("wxInputStream", "wxPyInputStream"); @@ -38742,6 +41001,19 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_CUR_HOTSPOT_Y",_wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_get, _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTION",_wrap_IMAGE_OPTION_RESOLUTION_get, _wrap_IMAGE_OPTION_RESOLUTION_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTIONUNIT",_wrap_IMAGE_OPTION_RESOLUTIONUNIT_get, _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set); + PyDict_SetItemString(d,"IMAGE_RESOLUTION_INCHES", SWIG_PyObj_FromInt((int)wxIMAGE_RESOLUTION_INCHES)); + PyDict_SetItemString(d,"IMAGE_RESOLUTION_CM", SWIG_PyObj_FromInt((int)wxIMAGE_RESOLUTION_CM)); + PyDict_SetItemString(d,"BMP_24BPP", SWIG_PyObj_FromInt((int)wxBMP_24BPP)); + PyDict_SetItemString(d,"BMP_8BPP", SWIG_PyObj_FromInt((int)wxBMP_8BPP)); + PyDict_SetItemString(d,"BMP_8BPP_GREY", SWIG_PyObj_FromInt((int)wxBMP_8BPP_GREY)); + PyDict_SetItemString(d,"BMP_8BPP_GRAY", SWIG_PyObj_FromInt((int)wxBMP_8BPP_GRAY)); + PyDict_SetItemString(d,"BMP_8BPP_RED", SWIG_PyObj_FromInt((int)wxBMP_8BPP_RED)); + PyDict_SetItemString(d,"BMP_8BPP_PALETTE", SWIG_PyObj_FromInt((int)wxBMP_8BPP_PALETTE)); + PyDict_SetItemString(d,"BMP_4BPP", SWIG_PyObj_FromInt((int)wxBMP_4BPP)); + PyDict_SetItemString(d,"BMP_1BPP", SWIG_PyObj_FromInt((int)wxBMP_1BPP)); + PyDict_SetItemString(d,"BMP_1BPP_BW", SWIG_PyObj_FromInt((int)wxBMP_1BPP_BW)); + PyDict_SetItemString(d,"EVENT_PROPAGATE_NONE", SWIG_PyObj_FromInt((int)wxEVENT_PROPAGATE_NONE)); + PyDict_SetItemString(d,"EVENT_PROPAGATE_MAX", SWIG_PyObj_FromInt((int)wxEVENT_PROPAGATE_MAX)); PyDict_SetItemString(d, "wxEVT_NULL", PyInt_FromLong(wxEVT_NULL)); PyDict_SetItemString(d, "wxEVT_FIRST", PyInt_FromLong(wxEVT_FIRST)); PyDict_SetItemString(d, "wxEVT_USER_FIRST", PyInt_FromLong(wxEVT_USER_FIRST)); @@ -38856,11 +41128,48 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_SET_FOCUS", PyInt_FromLong(wxEVT_COMMAND_SET_FOCUS)); PyDict_SetItemString(d, "wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong(wxEVT_COMMAND_KILL_FOCUS)); PyDict_SetItemString(d, "wxEVT_COMMAND_ENTER", PyInt_FromLong(wxEVT_COMMAND_ENTER)); + PyDict_SetItemString(d,"MOUSE_BTN_ANY", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_ANY)); + PyDict_SetItemString(d,"MOUSE_BTN_NONE", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_NONE)); + PyDict_SetItemString(d,"MOUSE_BTN_LEFT", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_LEFT)); + PyDict_SetItemString(d,"MOUSE_BTN_MIDDLE", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_MIDDLE)); + PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_RIGHT)); + PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_PyObj_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); + PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_PyObj_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_PyObj_FromInt((int)wxIDLE_PROCESS_ALL)); + PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_PyObj_FromInt((int)wxIDLE_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_PyObj_FromInt((int)wxPYAPP_ASSERT_SUPPRESS)); + PyDict_SetItemString(d,"PYAPP_ASSERT_EXCEPTION", SWIG_PyObj_FromInt((int)wxPYAPP_ASSERT_EXCEPTION)); + PyDict_SetItemString(d,"PYAPP_ASSERT_DIALOG", SWIG_PyObj_FromInt((int)wxPYAPP_ASSERT_DIALOG)); + PyDict_SetItemString(d,"PYAPP_ASSERT_LOG", SWIG_PyObj_FromInt((int)wxPYAPP_ASSERT_LOG)); + PyDict_SetItemString(d,"PRINT_WINDOWS", SWIG_PyObj_FromInt((int)wxPRINT_WINDOWS)); + PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_PyObj_FromInt((int)wxPRINT_POSTSCRIPT)); SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set); SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set); SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set); + PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_PyObj_FromInt((int)wxFLEX_GROWMODE_NONE)); + PyDict_SetItemString(d,"FLEX_GROWMODE_SPECIFIED", SWIG_PyObj_FromInt((int)wxFLEX_GROWMODE_SPECIFIED)); + PyDict_SetItemString(d,"FLEX_GROWMODE_ALL", SWIG_PyObj_FromInt((int)wxFLEX_GROWMODE_ALL)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set); + PyDict_SetItemString(d,"Left", SWIG_PyObj_FromInt((int)wxLeft)); + PyDict_SetItemString(d,"Top", SWIG_PyObj_FromInt((int)wxTop)); + PyDict_SetItemString(d,"Right", SWIG_PyObj_FromInt((int)wxRight)); + PyDict_SetItemString(d,"Bottom", SWIG_PyObj_FromInt((int)wxBottom)); + PyDict_SetItemString(d,"Width", SWIG_PyObj_FromInt((int)wxWidth)); + PyDict_SetItemString(d,"Height", SWIG_PyObj_FromInt((int)wxHeight)); + PyDict_SetItemString(d,"Centre", SWIG_PyObj_FromInt((int)wxCentre)); + PyDict_SetItemString(d,"Center", SWIG_PyObj_FromInt((int)wxCenter)); + PyDict_SetItemString(d,"CentreX", SWIG_PyObj_FromInt((int)wxCentreX)); + PyDict_SetItemString(d,"CentreY", SWIG_PyObj_FromInt((int)wxCentreY)); + PyDict_SetItemString(d,"Unconstrained", SWIG_PyObj_FromInt((int)wxUnconstrained)); + PyDict_SetItemString(d,"AsIs", SWIG_PyObj_FromInt((int)wxAsIs)); + PyDict_SetItemString(d,"PercentOf", SWIG_PyObj_FromInt((int)wxPercentOf)); + PyDict_SetItemString(d,"Above", SWIG_PyObj_FromInt((int)wxAbove)); + PyDict_SetItemString(d,"Below", SWIG_PyObj_FromInt((int)wxBelow)); + PyDict_SetItemString(d,"LeftOf", SWIG_PyObj_FromInt((int)wxLeftOf)); + PyDict_SetItemString(d,"RightOf", SWIG_PyObj_FromInt((int)wxRightOf)); + PyDict_SetItemString(d,"SameAs", SWIG_PyObj_FromInt((int)wxSameAs)); + PyDict_SetItemString(d,"Absolute", SWIG_PyObj_FromInt((int)wxAbsolute)); // Initialize threading, some globals and such __wxPyPreStart(d); diff --git a/wxPython/src/mac/gdi.py b/wxPython/src/mac/gdi.py index 7596b875ee..eb0df57fe3 100644 --- a/wxPython/src/mac/gdi.py +++ b/wxPython/src/mac/gdi.py @@ -126,6 +126,10 @@ def ColourRGB(*args, **kwargs): val.thisown = 1 return val +Color = Colour +NamedColor = NamedColour +ColorRGB = ColourRGB + class Palette(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -3402,6 +3406,49 @@ class PenListPtr(PenList): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = PenList _gdi.PenList_swigregister(PenListPtr) +cvar = _gdi.cvar +NORMAL_FONT = cvar.NORMAL_FONT +SMALL_FONT = cvar.SMALL_FONT +ITALIC_FONT = cvar.ITALIC_FONT +SWISS_FONT = cvar.SWISS_FONT +RED_PEN = cvar.RED_PEN +CYAN_PEN = cvar.CYAN_PEN +GREEN_PEN = cvar.GREEN_PEN +BLACK_PEN = cvar.BLACK_PEN +WHITE_PEN = cvar.WHITE_PEN +TRANSPARENT_PEN = cvar.TRANSPARENT_PEN +BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN +GREY_PEN = cvar.GREY_PEN +MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN +LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN +BLUE_BRUSH = cvar.BLUE_BRUSH +GREEN_BRUSH = cvar.GREEN_BRUSH +WHITE_BRUSH = cvar.WHITE_BRUSH +BLACK_BRUSH = cvar.BLACK_BRUSH +TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH +CYAN_BRUSH = cvar.CYAN_BRUSH +RED_BRUSH = cvar.RED_BRUSH +GREY_BRUSH = cvar.GREY_BRUSH +MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH +LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH +BLACK = cvar.BLACK +WHITE = cvar.WHITE +RED = cvar.RED +BLUE = cvar.BLUE +GREEN = cvar.GREEN +CYAN = cvar.CYAN +LIGHT_GREY = cvar.LIGHT_GREY +STANDARD_CURSOR = cvar.STANDARD_CURSOR +HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR +CROSS_CURSOR = cvar.CROSS_CURSOR +NullBitmap = cvar.NullBitmap +NullIcon = cvar.NullIcon +NullCursor = cvar.NullCursor +NullPen = cvar.NullPen +NullBrush = cvar.NullBrush +NullPalette = cvar.NullPalette +NullFont = cvar.NullFont +NullColour = cvar.NullColour class BrushList(core.Object): def __init__(self): raise RuntimeError, "No constructor defined" @@ -3505,6 +3552,7 @@ _gdi.FontList_swigregister(FontListPtr) #--------------------------------------------------------------------------- +NullColor = NullColour #--------------------------------------------------------------------------- class Effects(core.Object): @@ -3578,49 +3626,6 @@ class EffectsPtr(Effects): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = Effects _gdi.Effects_swigregister(EffectsPtr) -cvar = _gdi.cvar -NORMAL_FONT = cvar.NORMAL_FONT -SMALL_FONT = cvar.SMALL_FONT -ITALIC_FONT = cvar.ITALIC_FONT -SWISS_FONT = cvar.SWISS_FONT -RED_PEN = cvar.RED_PEN -CYAN_PEN = cvar.CYAN_PEN -GREEN_PEN = cvar.GREEN_PEN -BLACK_PEN = cvar.BLACK_PEN -WHITE_PEN = cvar.WHITE_PEN -TRANSPARENT_PEN = cvar.TRANSPARENT_PEN -BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN -GREY_PEN = cvar.GREY_PEN -MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN -LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN -BLUE_BRUSH = cvar.BLUE_BRUSH -GREEN_BRUSH = cvar.GREEN_BRUSH -WHITE_BRUSH = cvar.WHITE_BRUSH -BLACK_BRUSH = cvar.BLACK_BRUSH -TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH -CYAN_BRUSH = cvar.CYAN_BRUSH -RED_BRUSH = cvar.RED_BRUSH -GREY_BRUSH = cvar.GREY_BRUSH -MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH -LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH -BLACK = cvar.BLACK -WHITE = cvar.WHITE -RED = cvar.RED -BLUE = cvar.BLUE -GREEN = cvar.GREEN -CYAN = cvar.CYAN -LIGHT_GREY = cvar.LIGHT_GREY -STANDARD_CURSOR = cvar.STANDARD_CURSOR -HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR -CROSS_CURSOR = cvar.CROSS_CURSOR -NullBitmap = cvar.NullBitmap -NullIcon = cvar.NullIcon -NullCursor = cvar.NullCursor -NullPen = cvar.NullPen -NullBrush = cvar.NullBrush -NullPalette = cvar.NullPalette -NullFont = cvar.NullFont -NullColour = cvar.NullColour TheFontList = cvar.TheFontList ThePenList = cvar.ThePenList TheBrushList = cvar.TheBrushList diff --git a/wxPython/src/mac/gdi_wrap.cpp b/wxPython/src/mac/gdi_wrap.cpp index a012baa96c..a50c7c808c 100644 --- a/wxPython/src/mac/gdi_wrap.cpp +++ b/wxPython/src/mac/gdi_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -388,55 +237,56 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxMirrorDC swig_types[4] #define SWIGTYPE_p_byte swig_types[5] #define SWIGTYPE_p_wxPyFontEnumerator swig_types[6] -#define SWIGTYPE_p_wxIconLocation swig_types[7] -#define SWIGTYPE_p_wxImage swig_types[8] -#define SWIGTYPE_p_wxMetaFileDC swig_types[9] -#define SWIGTYPE_p_wxMask swig_types[10] -#define SWIGTYPE_p_wxFont swig_types[11] -#define SWIGTYPE_p_wxWindow swig_types[12] -#define SWIGTYPE_p_wxSize swig_types[13] -#define SWIGTYPE_p_double swig_types[14] -#define SWIGTYPE_p_wxMemoryDC swig_types[15] -#define SWIGTYPE_p_wxFontMapper swig_types[16] -#define SWIGTYPE_p_wxEffects swig_types[17] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[18] -#define SWIGTYPE_p_wxPalette swig_types[19] -#define SWIGTYPE_p_wxBitmap swig_types[20] -#define SWIGTYPE_p_wxObject swig_types[21] -#define SWIGTYPE_p_wxRegionIterator swig_types[22] -#define SWIGTYPE_p_wxRect swig_types[23] -#define SWIGTYPE_p_wxString swig_types[24] -#define SWIGTYPE_p_wxPrinterDC swig_types[25] -#define SWIGTYPE_p_wxIconBundle swig_types[26] -#define SWIGTYPE_p_wxPoint swig_types[27] -#define SWIGTYPE_p_wxDash swig_types[28] -#define SWIGTYPE_p_wxScreenDC swig_types[29] -#define SWIGTYPE_p_wxCursor swig_types[30] -#define SWIGTYPE_p_wxClientDC swig_types[31] -#define SWIGTYPE_p_wxBufferedDC swig_types[32] -#define SWIGTYPE_p_wxImageList swig_types[33] -#define SWIGTYPE_p_unsigned_char swig_types[34] -#define SWIGTYPE_p_wxGDIObject swig_types[35] -#define SWIGTYPE_p_wxLocale swig_types[36] +#define SWIGTYPE_p_char swig_types[7] +#define SWIGTYPE_p_wxIconLocation swig_types[8] +#define SWIGTYPE_p_wxImage swig_types[9] +#define SWIGTYPE_p_wxMetaFileDC swig_types[10] +#define SWIGTYPE_p_wxMask swig_types[11] +#define SWIGTYPE_p_wxFont swig_types[12] +#define SWIGTYPE_p_wxWindow swig_types[13] +#define SWIGTYPE_p_wxSize swig_types[14] +#define SWIGTYPE_p_double swig_types[15] +#define SWIGTYPE_p_wxMemoryDC swig_types[16] +#define SWIGTYPE_p_wxFontMapper swig_types[17] +#define SWIGTYPE_p_wxEffects swig_types[18] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[19] +#define SWIGTYPE_p_wxPalette swig_types[20] +#define SWIGTYPE_p_wxBitmap swig_types[21] +#define SWIGTYPE_p_wxObject swig_types[22] +#define SWIGTYPE_p_wxRegionIterator swig_types[23] +#define SWIGTYPE_p_wxRect swig_types[24] +#define SWIGTYPE_p_wxString swig_types[25] +#define SWIGTYPE_p_wxPrinterDC swig_types[26] +#define SWIGTYPE_p_wxIconBundle swig_types[27] +#define SWIGTYPE_p_wxPoint swig_types[28] +#define SWIGTYPE_p_wxDash swig_types[29] +#define SWIGTYPE_p_wxScreenDC swig_types[30] +#define SWIGTYPE_p_wxCursor swig_types[31] +#define SWIGTYPE_p_wxClientDC swig_types[32] +#define SWIGTYPE_p_wxBufferedDC swig_types[33] +#define SWIGTYPE_p_wxImageList swig_types[34] +#define SWIGTYPE_p_unsigned_char swig_types[35] +#define SWIGTYPE_p_wxGDIObject swig_types[36] #define SWIGTYPE_p_wxIcon swig_types[37] -#define SWIGTYPE_p_wxRegion swig_types[38] -#define SWIGTYPE_p_wxLanguageInfo swig_types[39] -#define SWIGTYPE_p_wxConfigBase swig_types[40] -#define SWIGTYPE_p_wxWindowDC swig_types[41] -#define SWIGTYPE_p_wxPrintData swig_types[42] -#define SWIGTYPE_p_wxBrushList swig_types[43] -#define SWIGTYPE_p_wxFontList swig_types[44] -#define SWIGTYPE_p_wxPen swig_types[45] -#define SWIGTYPE_p_wxBufferedPaintDC swig_types[46] -#define SWIGTYPE_p_wxPaintDC swig_types[47] -#define SWIGTYPE_p_wxPenList swig_types[48] -#define SWIGTYPE_p_wxPyPen swig_types[49] -#define SWIGTYPE_p_int swig_types[50] -#define SWIGTYPE_p_wxMetaFile swig_types[51] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[52] -#define SWIGTYPE_p_wxEncodingConverter swig_types[53] -#define SWIGTYPE_p_wxColourDatabase swig_types[54] -static swig_type_info *swig_types[56]; +#define SWIGTYPE_p_wxLocale swig_types[38] +#define SWIGTYPE_p_wxRegion swig_types[39] +#define SWIGTYPE_p_wxLanguageInfo swig_types[40] +#define SWIGTYPE_p_wxConfigBase swig_types[41] +#define SWIGTYPE_p_wxWindowDC swig_types[42] +#define SWIGTYPE_p_wxPrintData swig_types[43] +#define SWIGTYPE_p_wxBrushList swig_types[44] +#define SWIGTYPE_p_wxFontList swig_types[45] +#define SWIGTYPE_p_wxPen swig_types[46] +#define SWIGTYPE_p_wxBufferedPaintDC swig_types[47] +#define SWIGTYPE_p_wxPaintDC swig_types[48] +#define SWIGTYPE_p_wxPenList swig_types[49] +#define SWIGTYPE_p_wxPyPen swig_types[50] +#define SWIGTYPE_p_int swig_types[51] +#define SWIGTYPE_p_wxMetaFile swig_types[52] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[53] +#define SWIGTYPE_p_wxEncodingConverter swig_types[54] +#define SWIGTYPE_p_wxColourDatabase swig_types[55] +static swig_type_info *swig_types[57]; /* -------- TYPES TABLE (END) -------- */ @@ -448,11 +298,73 @@ static swig_type_info *swig_types[56]; #define SWIG_name "_gdi" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(unsigned char) +SWIG_PyObj_AsUnsignedChar(PyObject *obj) +{ + return numeric_cast(unsigned char, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned char", UCHAR_MAX)); +} + PyObject *wxColour_Get(wxColour *self){ PyObject* rv = PyTuple_New(3); int red = -1; @@ -469,6 +381,14 @@ PyObject *wxColour_Get(wxColour *self){ return rv; } +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -524,6 +444,14 @@ void wxPyPen::SetDashes(int nb_dashes, const wxDash *dash) } +SWIGSTATIC(short) +SWIG_PyObj_AsShort(PyObject *obj) +{ + return numeric_cast(short, + SWIG_PyObj_AsLongInRange(obj, "short", SHRT_MIN, SHRT_MAX)); +} + + #include static char** ConvertListOfStrings(PyObject* listOfStrings) { @@ -606,6 +534,13 @@ int wxIconLocation_GetIndex(wxIconLocation *self){ return -1; } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + wxCursor *new_wxCursor(wxString const *cursorName,long flags,int hotSpotX,int hotSpotY){ @@ -652,6 +587,14 @@ wxString wxNativeFontInfo___str__(wxNativeFontInfo *self){ return NULL; } + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + PyObject *wxFontMapper_GetAltForEncoding(wxFontMapper *self,wxFontEncoding encoding,wxString const &facename,bool interactive){ wxFontEncoding alt_enc; if (self->GetAltForEncoding(encoding, &alt_enc, facename, interactive)) @@ -708,6 +651,22 @@ wxColour wxDC_GetPixel(wxDC *self,wxPoint const &pt){ self->GetPixel(pt, &col); return col; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + wxRect wxDC_DrawImageLabel(wxDC *self,wxString const &text,wxBitmap const &image,wxRect const &rect,int alignment,int indexAccel){ wxRect rv; self->DrawLabel(text, image, rect, alignment, indexAccel, &rv); @@ -836,7 +795,7 @@ static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -856,7 +815,7 @@ static PyObject *_wrap_GDIObject_SetVisible(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GDIObject_SetVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGDIObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -891,7 +850,7 @@ static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -921,19 +880,19 @@ static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Colour",kwnames,&obj0,&obj1,&obj2)) goto fail; if (obj0) { { - arg1 = (unsigned char) SPyObj_AsUnsignedChar(obj0); + arg1 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj0); if (PyErr_Occurred()) SWIG_fail; } } if (obj1) { { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -1024,7 +983,7 @@ static PyObject *_wrap_new_ColourRGB(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ColourRGB",kwnames,&obj0)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -1059,7 +1018,7 @@ static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -1084,7 +1043,7 @@ static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -1109,7 +1068,7 @@ static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -1134,7 +1093,7 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1158,15 +1117,15 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Colour_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -1196,7 +1155,7 @@ static PyObject *_wrap_Colour_SetRGB(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetRGB",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned long) SPyObj_AsUnsignedLong(obj1); + arg2 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -1238,7 +1197,7 @@ static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1270,7 +1229,7 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1356,6 +1315,7 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa unsigned char *arg3 = (unsigned char *) 0 ; unsigned char *arg4 = (unsigned char *) 0 ; wxPalette *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -1363,7 +1323,11 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa (char *) "n",(char *) "red",(char *) "green",(char *) "blue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iOOO:new_Palette",kwnames,&arg1,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_Palette",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -1423,15 +1387,15 @@ static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Palette_GetPixel",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (byte) SPyObj_AsUnsignedChar(obj1); + arg2 = (byte) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (byte) SPyObj_AsUnsignedChar(obj2); + arg3 = (byte) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (byte) SPyObj_AsUnsignedChar(obj3); + arg4 = (byte) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -1441,7 +1405,7 @@ static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1460,6 +1424,7 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * byte temp4 ; byte temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pixel", NULL }; @@ -1467,8 +1432,12 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * arg3 = &temp3; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Palette_GetRGB",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Palette_GetRGB",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetRGB(arg2,arg3,arg4,arg5); @@ -1476,7 +1445,7 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -1513,7 +1482,7 @@ static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1535,15 +1504,29 @@ static PyObject *_wrap_new_Pen(PyObject *self, PyObject *args, PyObject *kwargs) wxPen *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "width",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:new_Pen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_Pen",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPen *)new wxPen(*arg1,arg2,arg3); @@ -1600,7 +1583,7 @@ static PyObject *_wrap_Pen_GetCap(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1654,7 +1637,7 @@ static PyObject *_wrap_Pen_GetJoin(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1679,7 +1662,7 @@ static PyObject *_wrap_Pen_GetStyle(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1704,7 +1687,7 @@ static PyObject *_wrap_Pen_GetWidth(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1729,7 +1712,7 @@ static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1741,12 +1724,17 @@ static PyObject *_wrap_Pen_SetCap(PyObject *self, PyObject *args, PyObject *kwar wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cap_style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetCap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetCap",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCap(arg2); @@ -1797,12 +1785,17 @@ static PyObject *_wrap_Pen_SetJoin(PyObject *self, PyObject *args, PyObject *kwa wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "join_style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetJoin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetJoin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetJoin(arg2); @@ -1822,12 +1815,17 @@ static PyObject *_wrap_Pen_SetStyle(PyObject *self, PyObject *args, PyObject *kw wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -1847,12 +1845,17 @@ static PyObject *_wrap_Pen_SetWidth(PyObject *self, PyObject *args, PyObject *kw wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -1945,15 +1948,29 @@ static PyObject *_wrap_new_PyPen(PyObject *self, PyObject *args, PyObject *kwarg wxPyPen *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "width",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:new_PyPen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_PyPen",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyPen *)new wxPyPen(*arg1,arg2,arg3); @@ -2044,15 +2061,22 @@ static PyObject *_wrap_new_Brush(PyObject *self, PyObject *args, PyObject *kwarg wxBrush *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_Brush",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Brush",kwnames,&obj0,&obj1)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBrush *)new wxBrush((wxColour const &)*arg1,arg2); @@ -2127,12 +2151,17 @@ static PyObject *_wrap_Brush_SetStyle(PyObject *self, PyObject *args, PyObject * wxBrush *arg1 = (wxBrush *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Brush_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -2224,7 +2253,7 @@ static PyObject *_wrap_Brush_GetStyle(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2274,7 +2303,7 @@ static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2299,7 +2328,7 @@ static PyObject *_wrap_Brush_GetMacTheme(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromShort((short)result); return resultobj; fail: return NULL; @@ -2311,12 +2340,17 @@ static PyObject *_wrap_Brush_SetMacTheme(PyObject *self, PyObject *args, PyObjec wxBrush *arg1 = (wxBrush *) 0 ; short arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "macThemeBrush", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oh:Brush_SetMacTheme",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetMacTheme",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (short) SWIG_PyObj_AsShort(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMacTheme(arg2); @@ -2345,16 +2379,23 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar wxBitmap *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_Bitmap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Bitmap",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (wxBitmapType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new wxBitmap((wxString const &)*arg1,(wxBitmapType )arg2); @@ -2407,11 +2448,28 @@ static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 = (int) -1 ; wxBitmap *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|i:new_EmptyBitmap",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_EmptyBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new wxBitmap(arg1,arg2,arg3); @@ -2460,15 +2518,22 @@ static PyObject *_wrap_new_BitmapFromImage(PyObject *self, PyObject *args, PyObj int arg2 = (int) -1 ; wxBitmap *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "image",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_BitmapFromImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BitmapFromImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new wxBitmap((wxImage const &)*arg1,arg2); @@ -2516,12 +2581,29 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje int arg4 = (int) 1 ; wxBitmap *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "bits",(char *) "width",(char *) "height",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:new_BitmapFromBits",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:new_BitmapFromBits",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; arg1 = obj0; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new_wxBitmap(arg1,arg2,arg3,arg4); @@ -2554,7 +2636,7 @@ static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2579,7 +2661,7 @@ static PyObject *_wrap_Bitmap_GetWidth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2604,7 +2686,7 @@ static PyObject *_wrap_Bitmap_GetHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2629,7 +2711,7 @@ static PyObject *_wrap_Bitmap_GetDepth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2794,18 +2876,23 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|O:Bitmap_SaveFile",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Bitmap_SaveFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (wxBitmapType) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -2816,7 +2903,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -2840,17 +2927,22 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Bitmap_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Bitmap_LoadFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (wxBitmapType) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3); @@ -2858,7 +2950,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -2897,7 +2989,7 @@ static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2909,12 +3001,17 @@ static PyObject *_wrap_Bitmap_SetHeight(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -2934,12 +3031,17 @@ static PyObject *_wrap_Bitmap_SetWidth(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -2959,12 +3061,17 @@ static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetDepth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetDepth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDepth(arg2); @@ -3065,16 +3172,35 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs wxIcon *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Icon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + { + arg2 = (wxBitmapType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4); @@ -3242,7 +3368,7 @@ static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3267,7 +3393,7 @@ static PyObject *_wrap_Icon_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3292,7 +3418,7 @@ static PyObject *_wrap_Icon_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3317,7 +3443,7 @@ static PyObject *_wrap_Icon_GetDepth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3329,12 +3455,17 @@ static PyObject *_wrap_Icon_SetWidth(PyObject *self, PyObject *args, PyObject *k wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -3354,12 +3485,17 @@ static PyObject *_wrap_Icon_SetHeight(PyObject *self, PyObject *args, PyObject * wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -3379,12 +3515,17 @@ static PyObject *_wrap_Icon_SetDepth(PyObject *self, PyObject *args, PyObject *k wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "d", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetDepth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetDepth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDepth(arg2); @@ -3443,11 +3584,12 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject wxIconLocation *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "num", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_IconLocation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconLocation",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -3455,6 +3597,12 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject temp1 = True; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxIconLocation *)new_wxIconLocation((wxString const *)arg1,arg2); @@ -3519,7 +3667,7 @@ static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3605,12 +3753,17 @@ static PyObject *_wrap_IconLocation_SetIndex(PyObject *self, PyObject *args, PyO wxIconLocation *arg1 = (wxIconLocation *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "num", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IconLocation_SetIndex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetIndex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxIconLocation_SetIndex(arg1,arg2); @@ -3643,7 +3796,7 @@ static PyObject *_wrap_IconLocation_GetIndex(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3686,16 +3839,21 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py wxIconBundle *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "file",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_IconBundleFromFile",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_IconBundleFromFile",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxIconBundle *)new wxIconBundle((wxString const &)*arg1,arg2); @@ -3808,17 +3966,22 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "file",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconBundle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddIcon((wxString const &)*arg2,arg3); @@ -3892,16 +4055,35 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar wxCursor *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "cursorName",(char *) "flags",(char *) "hotSpotX",(char *) "hotSpotY", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Cursor",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Cursor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4); @@ -3952,11 +4134,16 @@ static PyObject *_wrap_new_StockCursor(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 ; wxCursor *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:new_StockCursor",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_StockCursor",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCursor *)new wxCursor(arg1); @@ -4009,13 +4196,37 @@ static PyObject *_wrap_new_CursorFromBits(PyObject *self, PyObject *args, PyObje PyObject *arg6 = (PyObject *) 0 ; wxCursor *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "bits",(char *) "width",(char *) "height",(char *) "hotSpotX",(char *) "hotSpotY",(char *) "maskBits", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiO:new_CursorFromBits",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:new_CursorFromBits",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; arg1 = obj0; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { arg6 = obj5; } @@ -4051,7 +4262,7 @@ static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4072,11 +4283,39 @@ static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwar int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxRegion *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_Region",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Region",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new wxRegion(arg1,arg2,arg3,arg4); @@ -4101,11 +4340,12 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb wxColour temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|Oi:new_RegionFromBitmap",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_RegionFromBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4116,6 +4356,12 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; } } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1,(wxColour const &)*arg2,arg3); @@ -4137,15 +4383,22 @@ static PyObject *_wrap_new_RegionFromPoints(PyObject *self, PyObject *args, PyOb int arg3 = (int) wxWINDING_RULE ; wxRegion *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "points",(char *) "fillStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_RegionFromPoints",kwnames,&obj0,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_RegionFromPoints",kwnames,&obj0,&obj1)) goto fail; { arg2 = wxPoint_LIST_helper(obj0, &arg1); if (arg2 == NULL) SWIG_fail; } + if (obj1) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new_wxRegion(arg1,arg2,arg3); @@ -4221,12 +4474,22 @@ static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject int 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 *)"Oii:Region_Contains",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Contains",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->Contains(arg2,arg3); @@ -4234,7 +4497,7 @@ static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4266,7 +4529,7 @@ static PyObject *_wrap_Region_ContainsPoint(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4298,7 +4561,7 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4314,12 +4577,32 @@ static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, Py int arg5 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_ContainsRectDim",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_ContainsRectDim",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->Contains(arg2,arg3,arg4,arg5); @@ -4327,7 +4610,7 @@ static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4372,12 +4655,32 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject int arg5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Intersect",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Intersect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Intersect(arg2,arg3,arg4,arg5); @@ -4385,7 +4688,7 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4417,7 +4720,7 @@ static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4448,7 +4751,7 @@ static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4473,7 +4776,7 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4489,12 +4792,32 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw int arg5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Union",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Union",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Union(arg2,arg3,arg4,arg5); @@ -4502,7 +4825,7 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4534,7 +4857,7 @@ static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4565,7 +4888,7 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4581,12 +4904,32 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject int arg5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Subtract",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Subtract",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Subtract(arg2,arg3,arg4,arg5); @@ -4594,7 +4937,7 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4626,7 +4969,7 @@ static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4657,7 +5000,7 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4673,12 +5016,32 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar int arg5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Xor",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Xor",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Xor(arg2,arg3,arg4,arg5); @@ -4686,7 +5049,7 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4718,7 +5081,7 @@ static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4749,7 +5112,7 @@ static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4797,11 +5160,12 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|Oi:Region_UnionBitmap",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Region_UnionBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,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) { @@ -4813,6 +5177,12 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Union((wxBitmap const &)*arg2,(wxColour const &)*arg3,arg4); @@ -4820,7 +5190,7 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4904,7 +5274,7 @@ static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4929,7 +5299,7 @@ static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4954,7 +5324,7 @@ static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4979,7 +5349,7 @@ static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5004,7 +5374,7 @@ static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5029,7 +5399,7 @@ static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5083,7 +5453,7 @@ static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5156,7 +5526,7 @@ static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5288,7 +5658,7 @@ static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5313,7 +5683,7 @@ static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5338,7 +5708,7 @@ static PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5363,7 +5733,7 @@ static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5419,7 +5789,7 @@ static PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5444,7 +5814,7 @@ static PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5456,12 +5826,17 @@ static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *self, PyObject *arg wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pointsize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetPointSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPointSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPointSize(arg2); @@ -5481,12 +5856,17 @@ static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *self, PyObject *args, P wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontStyle) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle((wxFontStyle )arg2); @@ -5506,12 +5886,17 @@ static PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *self, PyObject *args, wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetWeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetWeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontWeight) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWeight((wxFontWeight )arg2); @@ -5539,7 +5924,7 @@ static PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetUnderlined",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -5593,12 +5978,17 @@ static PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *self, PyObject *args, wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "family", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetFamily",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFamily",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontFamily) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFamily((wxFontFamily )arg2); @@ -5618,12 +6008,17 @@ static PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *self, PyObject *args wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetEncoding",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetEncoding",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEncoding((wxFontEncoding )arg2); @@ -5664,7 +6059,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5767,7 +6162,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5886,12 +6281,17 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *self, PyObject wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeEncodingInfo_encoding_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_encoding_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->encoding = (wxFontEncoding )arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -5914,7 +6314,7 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->encoding); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5993,7 +6393,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6050,11 +6450,16 @@ static PyObject *_wrap_GetNativeFontEncoding(PyObject *self, PyObject *args, PyO PyObject *resultobj; int arg1 ; wxNativeEncodingInfo *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetNativeFontEncoding",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetNativeFontEncoding",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNativeEncodingInfo *)wxGetNativeFontEncoding((wxFontEncoding )arg1); @@ -6090,7 +6495,7 @@ static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6213,7 +6618,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6224,7 +6629,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -6254,7 +6659,7 @@ static PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -6272,7 +6677,7 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncoding",kwnames,&obj0)) goto fail; { - arg1 = (size_t) SPyObj_AsUnsignedLong(obj0); + arg1 = (size_t) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -6282,7 +6687,7 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6293,11 +6698,16 @@ static PyObject *_wrap_FontMapper_GetEncodingName(PyObject *self, PyObject *args PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:FontMapper_GetEncodingName",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingName",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxFontMapper::GetEncodingName((wxFontEncoding )arg1); @@ -6322,11 +6732,16 @@ static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *self, PyObjec PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:FontMapper_GetEncodingDescription",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingDescription",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxFontMapper::GetEncodingDescription((wxFontEncoding )arg1); @@ -6452,14 +6867,19 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar PyObject *result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "facename",(char *) "interactive", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -6469,7 +6889,7 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6504,13 +6924,18 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * bool result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "facename", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -6525,7 +6950,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -6626,16 +7051,37 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs int arg7 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; bool temp6 = 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 *) "pointSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "face",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiii|OOi:new_Font",kwnames,&arg1,&arg2,&arg3,&arg4,&obj4,&obj5,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_Font",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } } @@ -6646,6 +7092,12 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs temp6 = True; } } + if (obj6) { + { + arg7 = (wxFontEncoding) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFont *)new wxFont(arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,(wxFontEncoding )arg7); @@ -6768,12 +7220,30 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg int arg5 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; bool temp4 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|iOi:new_Font2",kwnames,&arg1,&arg2,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_Font2",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxFontFamily) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -6781,6 +7251,12 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg temp4 = True; } } + if (obj4) { + { + arg5 = (wxFontEncoding) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFont *)new_wxFont(arg1,(wxFontFamily )arg2,arg3,(wxString const &)*arg4,(wxFontEncoding )arg5); @@ -6821,7 +7297,7 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6852,7 +7328,7 @@ static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6883,7 +7359,7 @@ static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6908,7 +7384,7 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6933,7 +7409,7 @@ static PyObject *_wrap_Font_GetFamily(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6958,7 +7434,7 @@ static PyObject *_wrap_Font_GetStyle(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6983,7 +7459,7 @@ static PyObject *_wrap_Font_GetWeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7008,7 +7484,7 @@ static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7064,7 +7540,7 @@ static PyObject *_wrap_Font_GetEncoding(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7114,7 +7590,7 @@ static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7188,12 +7664,17 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *self, PyObject *args, PyObjec wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pointSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetPointSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPointSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPointSize(arg2); @@ -7213,12 +7694,17 @@ static PyObject *_wrap_Font_SetFamily(PyObject *self, PyObject *args, PyObject * wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "family", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetFamily",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFamily",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFamily(arg2); @@ -7238,12 +7724,17 @@ static PyObject *_wrap_Font_SetStyle(PyObject *self, PyObject *args, PyObject *k wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -7263,12 +7754,17 @@ static PyObject *_wrap_Font_SetWeight(PyObject *self, PyObject *args, PyObject * wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetWeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetWeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWeight(arg2); @@ -7336,7 +7832,7 @@ static PyObject *_wrap_Font_SetUnderlined(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetUnderlined",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -7358,12 +7854,17 @@ static PyObject *_wrap_Font_SetEncoding(PyObject *self, PyObject *args, PyObject wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetEncoding",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetEncoding",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEncoding((wxFontEncoding )arg2); @@ -7595,7 +8096,7 @@ static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -7631,7 +8132,7 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7653,7 +8154,7 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7663,11 +8164,16 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Font_SetDefaultEncoding",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_SetDefaultEncoding",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFont::SetDefaultEncoding((wxFontEncoding )arg1); @@ -7754,7 +8260,7 @@ static PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *self, PyObject arg2 = obj1; arg3 = obj2; { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -7778,16 +8284,23 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec bool arg3 = (bool) False ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "fixedWidthOnly", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7798,7 +8311,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7834,7 +8347,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7911,12 +8424,17 @@ static PyObject *_wrap_LanguageInfo_Language_set(PyObject *self, PyObject *args, wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "Language", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:LanguageInfo_Language_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Language_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->Language = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -7939,7 +8457,7 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->Language); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8080,11 +8598,25 @@ static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwar int arg1 = (int) wxLANGUAGE_DEFAULT ; int arg2 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ; wxLocale *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "language",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Locale",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Locale",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLocale *)new wxLocale(arg1,arg2); @@ -8170,13 +8702,13 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -8187,7 +8719,7 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8225,12 +8757,26 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw int arg3 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "language",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:Locale_Init2",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Locale_Init2",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Init(arg2,arg3); @@ -8238,7 +8784,7 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8260,7 +8806,7 @@ static PyObject *_wrap_Locale_GetSystemLanguage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8282,7 +8828,7 @@ static PyObject *_wrap_Locale_GetSystemEncoding(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8335,7 +8881,7 @@ static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8391,7 +8937,7 @@ static PyObject *_wrap_Locale_GetLanguage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8523,7 +9069,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8564,7 +9110,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8583,11 +9129,16 @@ static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 ; wxLanguageInfo *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "lang", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Locale_GetLanguageInfo",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageInfo",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLanguageInfo *)wxLocale::GetLanguageInfo(arg1); @@ -8606,11 +9157,16 @@ static PyObject *_wrap_Locale_GetLanguageName(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "lang", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Locale_GetLanguageName",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageName",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxLocale::GetLanguageName(arg1); @@ -8890,7 +9446,7 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) { temp2 = True; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -8976,7 +9532,7 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) { } if (_v) { { - SPyObj_AsUnsignedInt(argv[2]); + SWIG_PyObj_AsUnsignedLong(argv[2]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -9050,12 +9606,29 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py int arg4 = (int) wxCONVERT_STRICT ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "input_enc",(char *) "output_enc",(char *) "method", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:EncodingConverter_Init",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:EncodingConverter_Init",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEncodingConverter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (wxFontEncoding) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Init((wxFontEncoding )arg2,(wxFontEncoding )arg3,arg4); @@ -9063,7 +9636,7 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9122,11 +9695,23 @@ static PyObject *_wrap_EncodingConverter_GetPlatformEquivalents(PyObject *self, int arg1 ; int arg2 = (int) wxPLATFORM_CURRENT ; wxFontEncodingArray result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "enc",(char *) "platform", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:EncodingConverter_GetPlatformEquivalents",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:EncodingConverter_GetPlatformEquivalents",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxEncodingConverter::GetPlatformEquivalents((wxFontEncoding )arg1,arg2); @@ -9152,11 +9737,16 @@ static PyObject *_wrap_EncodingConverter_GetAllEquivalents(PyObject *self, PyObj PyObject *resultobj; int arg1 ; wxFontEncodingArray result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "enc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:EncodingConverter_GetAllEquivalents",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EncodingConverter_GetAllEquivalents",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxEncodingConverter::GetAllEquivalents((wxFontEncoding )arg1); @@ -9183,11 +9773,21 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar int arg1 ; int arg2 ; bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "encIn",(char *) "encOut", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii:EncodingConverter_CanConvert",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EncodingConverter_CanConvert",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxEncodingConverter::CanConvert((wxFontEncoding )arg1,(wxFontEncoding )arg2); @@ -9195,7 +9795,7 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9291,17 +9891,34 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * bool result; wxColour temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO|i:DC_FloodFillXY",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFillXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5); @@ -9309,7 +9926,7 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9328,11 +9945,12 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -9342,6 +9960,12 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4); @@ -9349,7 +9973,7 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9363,12 +9987,22 @@ static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *k int arg3 ; wxColour 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 *)"Oii:DC_GetPixelXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_GetPixelXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDC_GetPixelXY(arg1,arg2,arg3); @@ -9431,12 +10065,32 @@ static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *k int arg4 ; int 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 *)"Oiiii:DC_DrawLineXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawLineXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLine(arg2,arg3,arg4,arg5); @@ -9495,12 +10149,22 @@ static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject * int arg2 ; int 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 *)"Oii:DC_CrossHairXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CrossHairXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CrossHair(arg2,arg3); @@ -9556,12 +10220,42 @@ static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kw int arg6 ; int arg7 ; 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 *) "x1",(char *) "y1",(char *) "x2",(char *) "y2",(char *) "xc",(char *) "yc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiiii:DC_DrawArcXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawArc(arg2,arg3,arg4,arg5,arg6,arg7); @@ -9629,12 +10323,32 @@ static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObje int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawCheckMarkXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawCheckMarkXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCheckMark(arg2,arg3,arg4,arg5); @@ -9690,25 +10404,55 @@ static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyOb double arg6 ; double arg7 ; 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 *) "x",(char *) "y",(char *) "w",(char *) "h",(char *) "sa",(char *) "ea", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiidd:DC_DrawEllipticArcXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawEllipticArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawEllipticArc(arg2,arg3,arg4,arg5,arg6,arg7); - - wxPyEndAllowThreads(__tstate); + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg7 = (double) SWIG_PyObj_AsDouble(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->DrawEllipticArc(arg2,arg3,arg4,arg5,arg6,arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; @@ -9722,11 +10466,13 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "sz",(char *) "sa",(char *) "ea", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -9736,6 +10482,14 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje arg3 = &temp3; if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4,arg5); @@ -9756,12 +10510,22 @@ static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject * int arg2 ; int 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 *)"Oii:DC_DrawPointXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawPointXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPoint(arg2,arg3); @@ -9815,12 +10579,32 @@ static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObje int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawRectangleXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRectangle(arg2,arg3,arg4,arg5); @@ -9913,12 +10697,37 @@ static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, int arg5 ; 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 *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiid:DC_DrawRoundedRectangleXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DC_DrawRoundedRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle(arg2,arg3,arg4,arg5,arg6); @@ -9944,11 +10753,12 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "sz",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOd:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -9958,6 +10768,10 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P arg3 = &temp3; if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4); @@ -9980,16 +10794,21 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "r",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -10011,12 +10830,27 @@ static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject int arg3 ; int arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:DC_DrawCircleXY",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawCircleXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCircle(arg2,arg3,arg4); @@ -10039,16 +10873,21 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k wxPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:DC_DrawCircle",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawCircle",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCircle((wxPoint const &)*arg2,arg3); @@ -10071,12 +10910,32 @@ static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawEllipseXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipseXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipse(arg2,arg3,arg4,arg5); @@ -10168,16 +11027,26 @@ static PyObject *_wrap_DC_DrawIconXY(PyObject *self, PyObject *args, PyObject *k int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "icon",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:DC_DrawIconXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawIconXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawIcon((wxIcon const &)*arg2,arg3,arg4); @@ -10238,20 +11107,30 @@ static PyObject *_wrap_DC_DrawBitmapXY(PyObject *self, PyObject *args, PyObject bool arg5 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bmp",(char *) "x",(char *) "y",(char *) "useMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,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; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } } @@ -10296,7 +11175,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -10323,17 +11202,27 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:DC_DrawTextXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawTextXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawText((wxString const &)*arg2,arg3,arg4); @@ -10413,17 +11302,32 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "x",(char *) "y",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiid:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRotatedText((wxString const &)*arg2,arg3,arg4,arg5); @@ -10457,11 +11361,12 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "pt",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOd:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -10472,6 +11377,10 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRotatedText((wxString const &)*arg2,(wxPoint const &)*arg3,arg4); @@ -10510,18 +11419,69 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg int arg12 = (int) -1 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xdest",(char *) "ydest",(char *) "width",(char *) "height",(char *) "source",(char *) "xsrc",(char *) "ysrc",(char *) "rop",(char *) "useMask",(char *) "xsrcMask",(char *) "ysrcMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiiOii|iOii:DC_BlitXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&arg7,&arg8,&arg9,&obj9,&arg11,&arg12)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO|OOOO:DC_BlitXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { { - arg10 = (bool) SPyObj_AsBool(obj9); + arg10 = (bool) SWIG_PyObj_AsBool(obj9); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj10) { + { + arg11 = (int) SWIG_PyObj_AsInt(obj10); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj11) { + { + arg12 = (int) SWIG_PyObj_AsInt(obj11); if (PyErr_Occurred()) SWIG_fail; } } @@ -10532,7 +11492,7 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10560,13 +11520,14 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "destPt",(char *) "sz",(char *) "source",(char *) "srcPt",(char *) "rop",(char *) "useMask",(char *) "srcPtMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|iOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -10581,9 +11542,15 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) arg5 = &temp5; if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -10600,7 +11567,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10616,16 +11583,30 @@ static PyObject *_wrap_DC_DrawLines(PyObject *self, PyObject *args, PyObject *kw int arg5 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|ii:DC_DrawLines",kwnames,&obj0,&obj1,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DC_DrawLines",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxPoint_LIST_helper(obj1, &arg2); if (arg3 == NULL) SWIG_fail; } + if (obj2) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3,arg4,arg5); @@ -10656,16 +11637,37 @@ static PyObject *_wrap_DC_DrawPolygon(PyObject *self, PyObject *args, PyObject * int arg6 = (int) wxODDEVEN_RULE ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset",(char *) "fillStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iii:DC_DrawPolygon",kwnames,&obj0,&obj1,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DC_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxPoint_LIST_helper(obj1, &arg2); if (arg3 == NULL) SWIG_fail; } + if (obj2) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4,arg5,arg6); @@ -10698,11 +11700,13 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|ii:DC_DrawLabel",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:DC_DrawLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -10713,6 +11717,18 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw arg3 = &temp3; if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLabel((wxString const &)*arg2,(wxRect const &)*arg3,arg4,arg5); @@ -10750,11 +11766,13 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "image",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|ii:DC_DrawImageLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:DC_DrawImageLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -10769,6 +11787,18 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec arg4 = &temp4; if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDC_DrawImageLabel(arg1,(wxString const &)*arg2,(wxBitmap const &)*arg3,(wxRect const &)*arg4,arg5,arg6); @@ -10882,7 +11912,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -11094,12 +12124,17 @@ static PyObject *_wrap_DC_SetBackgroundMode(PyObject *self, PyObject *args, PyOb wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetBackgroundMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBackgroundMode(arg2); @@ -11152,12 +12187,32 @@ static PyObject *_wrap_DC_SetClippingRegionXY(PyObject *self, PyObject *args, Py int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_SetClippingRegionXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_SetClippingRegionXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetClippingRegion(arg2,arg3,arg4,arg5); @@ -11394,7 +12449,7 @@ static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11419,7 +12474,7 @@ static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11759,12 +12814,17 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->DeviceToLogicalX(arg2); @@ -11772,7 +12832,7 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11785,12 +12845,17 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->DeviceToLogicalY(arg2); @@ -11798,7 +12863,7 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11811,12 +12876,17 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalXRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalXRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->DeviceToLogicalXRel(arg2); @@ -11824,7 +12894,7 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11837,12 +12907,17 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalYRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalYRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->DeviceToLogicalYRel(arg2); @@ -11850,7 +12925,7 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11863,12 +12938,17 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->LogicalToDeviceX(arg2); @@ -11876,7 +12956,7 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11889,12 +12969,17 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->LogicalToDeviceY(arg2); @@ -11902,7 +12987,7 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11915,12 +13000,17 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceXRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceXRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->LogicalToDeviceXRel(arg2); @@ -11928,7 +13018,7 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11941,12 +13031,17 @@ static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceYRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceYRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->LogicalToDeviceYRel(arg2); @@ -11954,7 +13049,7 @@ static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11979,7 +13074,7 @@ static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12004,7 +13099,7 @@ static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12029,7 +13124,7 @@ static PyObject *_wrap_DC_GetDepth(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12083,7 +13178,7 @@ static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12108,7 +13203,7 @@ static PyObject *_wrap_DC_GetBackgroundMode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12363,7 +13458,7 @@ static PyObject *_wrap_DC_GetMapMode(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12375,12 +13470,17 @@ static PyObject *_wrap_DC_SetMapMode(PyObject *self, PyObject *args, PyObject *k wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetMapMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetMapMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMapMode(arg2); @@ -12439,12 +13539,22 @@ static PyObject *_wrap_DC_SetUserScale(PyObject *self, PyObject *args, PyObject 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:DC_SetUserScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetUserScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetUserScale(arg2,arg3); @@ -12503,12 +13613,22 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje 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:DC_SetLogicalScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetLogicalScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalScale(arg2,arg3); @@ -12596,12 +13716,22 @@ static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObj int arg2 ; int 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 *)"Oii:DC_SetLogicalOrigin",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetLogicalOrigin",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalOrigin(arg2,arg3); @@ -12689,12 +13819,22 @@ static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObje int arg2 ; int 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 *)"Oii:DC_SetDeviceOrigin",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetDeviceOrigin",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDeviceOrigin(arg2,arg3); @@ -12724,11 +13864,11 @@ static PyObject *_wrap_DC_SetAxisOrientation(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetAxisOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -12763,7 +13903,7 @@ static PyObject *_wrap_DC_GetLogicalFunction(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12775,12 +13915,17 @@ static PyObject *_wrap_DC_SetLogicalFunction(PyObject *self, PyObject *args, PyO wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "function", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetLogicalFunction",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetLogicalFunction",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalFunction(arg2); @@ -12808,7 +13953,7 @@ static PyObject *_wrap_DC_SetOptimization(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetOptimization",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12843,7 +13988,7 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12856,12 +14001,22 @@ static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObje int arg2 ; int 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 *)"Oii:DC_CalcBoundingBox",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CalcBoundingBox",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CalcBoundingBox(arg2,arg3); @@ -12918,7 +14073,7 @@ static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12943,7 +14098,7 @@ static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12968,7 +14123,7 @@ static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12993,7 +14148,7 @@ static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13528,7 +14683,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13558,7 +14713,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13583,7 +14738,7 @@ static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13710,7 +14865,7 @@ static PyObject *_wrap_new_MirrorDC(PyObject *self, PyObject *args, PyObject *kw PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13823,11 +14978,16 @@ static PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *self, PyObject *args, static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "ppi", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:PostScriptDC_SetResolution",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_SetResolution",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPostScriptDC::SetResolution(arg1); @@ -13857,7 +15017,7 @@ static PyObject *_wrap_PostScriptDC_GetResolution(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13931,12 +15091,14 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject * bool temp1 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "width",(char *) "height",(char *) "description", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiiO:new_MetaFileDC",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_MetaFileDC",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -13944,6 +15106,18 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject * temp1 = True; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -14030,11 +15204,35 @@ static PyObject *_wrap_new_ImageList(PyObject *self, PyObject *args, PyObject *k int arg3 = (int) True ; int arg4 = (int) 1 ; wxImageList *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "mask",(char *) "initialCount", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|ii:new_ImageList",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_ImageList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImageList *)new wxImageList(arg1,arg2,arg3,arg4); @@ -14108,7 +15306,7 @@ static PyObject *_wrap_ImageList_Add(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14146,7 +15344,7 @@ static PyObject *_wrap_ImageList_AddWithColourMask(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14177,7 +15375,7 @@ static PyObject *_wrap_ImageList_AddIcon(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14191,13 +15389,18 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec wxBitmap *arg3 = 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "bitmap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ImageList_Replace",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageList_Replace",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -14209,7 +15412,7 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14227,21 +15430,43 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject * bool arg7 = (bool) (bool)False ; 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 *) "index",(char *) "dc",(char *) "x",(char *) "x",(char *) "flags",(char *) "solidBackground", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOii|iO:ImageList_Draw",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:ImageList_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg7 = (bool const) SPyObj_AsBool(obj6); + arg7 = (bool const) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -14252,7 +15477,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14277,7 +15502,7 @@ static PyObject *_wrap_ImageList_GetImageCount(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14290,12 +15515,17 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ImageList_Remove",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_Remove",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Remove(arg2); @@ -14303,7 +15533,7 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14328,7 +15558,7 @@ static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14344,14 +15574,19 @@ static PyObject *_wrap_ImageList_GetSize(PyObject *self, PyObject *args, PyObjec int temp3 ; int temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; arg3 = &temp3; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ImageList_GetSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetSize(arg2,*arg3,*arg4); @@ -14381,1203 +15616,1260 @@ static PyObject * ImageList_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pen", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddPen(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +static int _wrap_NORMAL_FONT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NORMAL_FONT is read-only."); + return 1; } -static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxColour *arg2 = 0 ; - int arg3 ; - int arg4 ; - wxPen *result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour",(char *) "width",(char *) "style", NULL - }; +static PyObject *_wrap_NORMAL_FONT_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxNORMAL_FONT, SWIGTYPE_p_wxFont, 0); + return pyobj; } -static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pen", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemovePen(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +static int _wrap_SMALL_FONT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable SMALL_FONT is read-only."); + return 1; } -static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static PyObject *_wrap_SMALL_FONT_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PenList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxSMALL_FONT, SWIGTYPE_p_wxFont, 0); + return pyobj; } -static PyObject * PenList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxPenList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +static int _wrap_ITALIC_FONT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ITALIC_FONT is read-only."); + return 1; } -static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxBrush *arg2 = (wxBrush *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "brush", NULL - }; + + +static PyObject *_wrap_ITALIC_FONT_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddBrush(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxITALIC_FONT, SWIGTYPE_p_wxFont, 0); + return pyobj; } -static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxColour *arg2 = 0 ; - int arg3 ; - wxBrush *result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour",(char *) "style", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0); - return resultobj; - fail: - return NULL; +static int _wrap_SWISS_FONT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable SWISS_FONT is read-only."); + return 1; } -static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxBrush *arg2 = (wxBrush *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "brush", NULL - }; +static PyObject *_wrap_SWISS_FONT_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemoveBrush(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxSWISS_FONT, SWIGTYPE_p_wxFont, 0); + return pyobj; } -static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static int _wrap_RED_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable RED_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_RED_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BrushList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxRED_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxBrushList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +static int _wrap_CYAN_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable CYAN_PEN is read-only."); + return 1; } -static PyObject *_wrap_new_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *result; - char *kwnames[] = { - NULL - }; + + +static PyObject *_wrap_CYAN_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ColourDatabase",kwnames)) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxColourDatabase *)new wxColourDatabase(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColourDatabase, 1); - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxCYAN_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static int _wrap_GREEN_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREEN_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_GREEN_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ColourDatabase",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxGREEN_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - wxColour result; - bool temp2 = False ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name", NULL - }; +static int _wrap_BLACK_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLACK_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_BLACK_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = True; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxColour * resultptr; - resultptr = new wxColour((wxColour &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); - } - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxBLACK_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxColour *arg2 = 0 ; - wxString result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; - fail: - return NULL; +static int _wrap_WHITE_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable WHITE_PEN is read-only."); + return 1; } -static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - wxColour *arg3 = 0 ; - bool temp2 = False ; - wxColour temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "colour", NULL - }; +static PyObject *_wrap_WHITE_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = True; - } - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxWHITE_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - int arg3 ; - int arg4 ; - int arg5 ; - bool temp2 = False ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL - }; +static int _wrap_TRANSPARENT_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_TRANSPARENT_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiii:ColourDatabase_Append",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = True; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject * ColourDatabase_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxColourDatabase, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +static int _wrap_BLACK_DASHED_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLACK_DASHED_PEN is read-only."); + return 1; } -static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "font", NULL - }; + + +static PyObject *_wrap_BLACK_DASHED_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddFont(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxBLACK_DASHED_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - int arg2 ; - int arg3 ; - int arg4 ; - int arg5 ; - bool arg6 = (bool) False ; - wxString const &arg7_defvalue = wxPyEmptyString ; - wxString *arg7 = (wxString *) &arg7_defvalue ; - int arg8 = (int) wxFONTENCODING_DEFAULT ; - wxFont *result; - bool temp7 = False ; - PyObject * obj0 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|OOi:FontList_FindOrCreateFont",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&arg8)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj5) { - { - arg6 = (bool) SPyObj_AsBool(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - } - if (obj6) { - { - arg7 = wxString_in_helper(obj6); - if (arg7 == NULL) SWIG_fail; - temp7 = True; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,(wxFontEncoding )arg8); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); - { - if (temp7) - delete arg7; - } - return resultobj; - fail: - { - if (temp7) - delete arg7; - } - return NULL; +static int _wrap_GREY_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREY_PEN is read-only."); + return 1; } -static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "font", NULL - }; +static PyObject *_wrap_GREY_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemoveFont(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxGREY_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static int _wrap_MEDIUM_GREY_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_MEDIUM_GREY_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject * FontList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxFontList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +static int _wrap_LIGHT_GREY_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_PEN is read-only."); + return 1; } -static int _wrap_NORMAL_FONT_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NORMAL_FONT is read-only."); + + +static PyObject *_wrap_LIGHT_GREY_PEN_get() { + PyObject *pyobj; + + pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; +} + + +static int _wrap_BLUE_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLUE_BRUSH is read-only."); return 1; } -static PyObject *_wrap_NORMAL_FONT_get() { +static PyObject *_wrap_BLUE_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxNORMAL_FONT, SWIGTYPE_p_wxFont, 0); + pyobj = SWIG_NewPointerObj((void *) wxBLUE_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_SMALL_FONT_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable SMALL_FONT is read-only."); +static int _wrap_GREEN_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREEN_BRUSH is read-only."); return 1; } -static PyObject *_wrap_SMALL_FONT_get() { +static PyObject *_wrap_GREEN_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxSMALL_FONT, SWIGTYPE_p_wxFont, 0); + pyobj = SWIG_NewPointerObj((void *) wxGREEN_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_ITALIC_FONT_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable ITALIC_FONT is read-only."); +static int _wrap_WHITE_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable WHITE_BRUSH is read-only."); return 1; } -static PyObject *_wrap_ITALIC_FONT_get() { +static PyObject *_wrap_WHITE_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxITALIC_FONT, SWIGTYPE_p_wxFont, 0); + pyobj = SWIG_NewPointerObj((void *) wxWHITE_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_SWISS_FONT_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable SWISS_FONT is read-only."); +static int _wrap_BLACK_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLACK_BRUSH is read-only."); return 1; } -static PyObject *_wrap_SWISS_FONT_get() { +static PyObject *_wrap_BLACK_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxSWISS_FONT, SWIGTYPE_p_wxFont, 0); + pyobj = SWIG_NewPointerObj((void *) wxBLACK_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_RED_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable RED_PEN is read-only."); +static int _wrap_TRANSPARENT_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_BRUSH is read-only."); return 1; } -static PyObject *_wrap_RED_PEN_get() { +static PyObject *_wrap_TRANSPARENT_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxRED_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_CYAN_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable CYAN_PEN is read-only."); +static int _wrap_CYAN_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable CYAN_BRUSH is read-only."); return 1; } -static PyObject *_wrap_CYAN_PEN_get() { +static PyObject *_wrap_CYAN_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxCYAN_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxCYAN_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_GREEN_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREEN_PEN is read-only."); +static int _wrap_RED_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable RED_BRUSH is read-only."); return 1; } -static PyObject *_wrap_GREEN_PEN_get() { +static PyObject *_wrap_RED_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxGREEN_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxRED_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_BLACK_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLACK_PEN is read-only."); +static int _wrap_GREY_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREY_BRUSH is read-only."); return 1; } -static PyObject *_wrap_BLACK_PEN_get() { +static PyObject *_wrap_GREY_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLACK_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxGREY_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_WHITE_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable WHITE_PEN is read-only."); +static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_BRUSH is read-only."); return 1; } -static PyObject *_wrap_WHITE_PEN_get() { +static PyObject *_wrap_MEDIUM_GREY_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxWHITE_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_TRANSPARENT_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_PEN is read-only."); +static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_BRUSH is read-only."); return 1; } -static PyObject *_wrap_TRANSPARENT_PEN_get() { +static PyObject *_wrap_LIGHT_GREY_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_BLACK_DASHED_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLACK_DASHED_PEN is read-only."); +static int _wrap_BLACK_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLACK is read-only."); return 1; } -static PyObject *_wrap_BLACK_DASHED_PEN_get() { +static PyObject *_wrap_BLACK_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLACK_DASHED_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxBLACK, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_GREY_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREY_PEN is read-only."); +static int _wrap_WHITE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable WHITE is read-only."); return 1; } -static PyObject *_wrap_GREY_PEN_get() { +static PyObject *_wrap_WHITE_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxGREY_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxWHITE, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_MEDIUM_GREY_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_PEN is read-only."); +static int _wrap_RED_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable RED is read-only."); return 1; } -static PyObject *_wrap_MEDIUM_GREY_PEN_get() { +static PyObject *_wrap_RED_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxRED, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_LIGHT_GREY_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_PEN is read-only."); +static int _wrap_BLUE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLUE is read-only."); return 1; } -static PyObject *_wrap_LIGHT_GREY_PEN_get() { +static PyObject *_wrap_BLUE_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxBLUE, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_BLUE_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLUE_BRUSH is read-only."); +static int _wrap_GREEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREEN is read-only."); return 1; } -static PyObject *_wrap_BLUE_BRUSH_get() { +static PyObject *_wrap_GREEN_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLUE_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxGREEN, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_GREEN_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREEN_BRUSH is read-only."); +static int _wrap_CYAN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable CYAN is read-only."); return 1; } -static PyObject *_wrap_GREEN_BRUSH_get() { +static PyObject *_wrap_CYAN_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxGREEN_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxCYAN, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_WHITE_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable WHITE_BRUSH is read-only."); +static int _wrap_LIGHT_GREY_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY is read-only."); return 1; } -static PyObject *_wrap_WHITE_BRUSH_get() { +static PyObject *_wrap_LIGHT_GREY_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxWHITE_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_BLACK_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLACK_BRUSH is read-only."); +static int _wrap_STANDARD_CURSOR_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable STANDARD_CURSOR is read-only."); return 1; } -static PyObject *_wrap_BLACK_BRUSH_get() { +static PyObject *_wrap_STANDARD_CURSOR_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLACK_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxSTANDARD_CURSOR, SWIGTYPE_p_wxCursor, 0); return pyobj; } -static int _wrap_TRANSPARENT_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_BRUSH is read-only."); +static int _wrap_HOURGLASS_CURSOR_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable HOURGLASS_CURSOR is read-only."); return 1; } -static PyObject *_wrap_TRANSPARENT_BRUSH_get() { +static PyObject *_wrap_HOURGLASS_CURSOR_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxHOURGLASS_CURSOR, SWIGTYPE_p_wxCursor, 0); return pyobj; } -static int _wrap_CYAN_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable CYAN_BRUSH is read-only."); +static int _wrap_CROSS_CURSOR_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable CROSS_CURSOR is read-only."); return 1; } -static PyObject *_wrap_CYAN_BRUSH_get() { +static PyObject *_wrap_CROSS_CURSOR_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxCYAN_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxCROSS_CURSOR, SWIGTYPE_p_wxCursor, 0); return pyobj; } -static int _wrap_RED_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable RED_BRUSH is read-only."); +static int _wrap_NullBitmap_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullBitmap is read-only."); return 1; } -static PyObject *_wrap_RED_BRUSH_get() { +static PyObject *_wrap_NullBitmap_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxRED_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullBitmap, SWIGTYPE_p_wxBitmap, 0); return pyobj; } -static int _wrap_GREY_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREY_BRUSH is read-only."); +static int _wrap_NullIcon_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullIcon is read-only."); return 1; } -static PyObject *_wrap_GREY_BRUSH_get() { +static PyObject *_wrap_NullIcon_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxGREY_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullIcon, SWIGTYPE_p_wxIcon, 0); return pyobj; } -static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_BRUSH is read-only."); +static int _wrap_NullCursor_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullCursor is read-only."); return 1; } -static PyObject *_wrap_MEDIUM_GREY_BRUSH_get() { +static PyObject *_wrap_NullCursor_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullCursor, SWIGTYPE_p_wxCursor, 0); return pyobj; } -static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_BRUSH is read-only."); +static int _wrap_NullPen_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullPen is read-only."); return 1; } -static PyObject *_wrap_LIGHT_GREY_BRUSH_get() { +static PyObject *_wrap_NullPen_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullPen, SWIGTYPE_p_wxPen, 0); return pyobj; } -static int _wrap_BLACK_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLACK is read-only."); +static int _wrap_NullBrush_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullBrush is read-only."); return 1; } -static PyObject *_wrap_BLACK_get() { +static PyObject *_wrap_NullBrush_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLACK, SWIGTYPE_p_wxColour, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullBrush, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_WHITE_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable WHITE is read-only."); +static int _wrap_NullPalette_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullPalette is read-only."); return 1; } -static PyObject *_wrap_WHITE_get() { +static PyObject *_wrap_NullPalette_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxWHITE, SWIGTYPE_p_wxColour, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullPalette, SWIGTYPE_p_wxPalette, 0); return pyobj; } -static int _wrap_RED_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable RED is read-only."); +static int _wrap_NullFont_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullFont is read-only."); return 1; } -static PyObject *_wrap_RED_get() { +static PyObject *_wrap_NullFont_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxRED, SWIGTYPE_p_wxColour, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullFont, SWIGTYPE_p_wxFont, 0); return pyobj; } -static int _wrap_BLUE_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLUE is read-only."); +static int _wrap_NullColour_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullColour is read-only."); return 1; } -static PyObject *_wrap_BLUE_get() { +static PyObject *_wrap_NullColour_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLUE, SWIGTYPE_p_wxColour, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullColour, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_GREEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREEN is read-only."); - return 1; +static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPenList *arg1 = (wxPenList *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pen", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AddPen(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_GREEN_get() { - PyObject *pyobj; +static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPenList *arg1 = (wxPenList *) 0 ; + wxColour *arg2 = 0 ; + int arg3 ; + int arg4 ; + wxPen *result; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour",(char *) "width",(char *) "style", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxGREEN, SWIGTYPE_p_wxColour, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); + return resultobj; + fail: + return NULL; } -static int _wrap_CYAN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable CYAN is read-only."); - return 1; +static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPenList *arg1 = (wxPenList *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pen", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemovePen(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_CYAN_get() { - PyObject *pyobj; +static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPenList *arg1 = (wxPenList *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxCYAN, SWIGTYPE_p_wxColour, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PenList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + return resultobj; + fail: + return NULL; } -static int _wrap_LIGHT_GREY_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY is read-only."); - return 1; +static PyObject * PenList_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxPenList, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); } - - -static PyObject *_wrap_LIGHT_GREY_get() { - PyObject *pyobj; +static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxBrush *arg2 = (wxBrush *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "brush", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY, SWIGTYPE_p_wxColour, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AddBrush(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static int _wrap_STANDARD_CURSOR_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable STANDARD_CURSOR is read-only."); - return 1; +static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxColour *arg2 = 0 ; + int arg3 ; + wxBrush *result; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour",(char *) "style", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0); + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_STANDARD_CURSOR_get() { - PyObject *pyobj; +static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxBrush *arg2 = (wxBrush *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "brush", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxSTANDARD_CURSOR, SWIGTYPE_p_wxCursor, 0); - return pyobj; -} - - -static int _wrap_HOURGLASS_CURSOR_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable HOURGLASS_CURSOR is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemoveBrush(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_HOURGLASS_CURSOR_get() { - PyObject *pyobj; +static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrushList *arg1 = (wxBrushList *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxHOURGLASS_CURSOR, SWIGTYPE_p_wxCursor, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BrushList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + return resultobj; + fail: + return NULL; } -static int _wrap_CROSS_CURSOR_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable CROSS_CURSOR is read-only."); - return 1; +static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxBrushList, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); } - - -static PyObject *_wrap_CROSS_CURSOR_get() { - PyObject *pyobj; +static PyObject *_wrap_new_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *result; + char *kwnames[] = { + NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxCROSS_CURSOR, SWIGTYPE_p_wxCursor, 0); - return pyobj; -} - - -static int _wrap_NullBitmap_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullBitmap is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ColourDatabase",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxColourDatabase *)new wxColourDatabase(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColourDatabase, 1); + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_NullBitmap_get() { - PyObject *pyobj; +static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullBitmap, SWIGTYPE_p_wxBitmap, 0); - return pyobj; -} - - -static int _wrap_NullIcon_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullIcon is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ColourDatabase",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_NullIcon_get() { - PyObject *pyobj; +static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + wxColour result; + bool temp2 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "name", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullIcon, SWIGTYPE_p_wxIcon, 0); - return pyobj; -} - - -static int _wrap_NullCursor_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullCursor is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxColour * resultptr; + resultptr = new wxColour((wxColour &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + } + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; } -static PyObject *_wrap_NullCursor_get() { - PyObject *pyobj; +static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxColour *arg2 = 0 ; + wxString result; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullCursor, SWIGTYPE_p_wxCursor, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; } -static int _wrap_NullPen_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullPen is read-only."); - return 1; +static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + wxColour *arg3 = 0 ; + bool temp2 = False ; + wxColour temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "name",(char *) "colour", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; } -static PyObject *_wrap_NullPen_get() { - PyObject *pyobj; +static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + int arg3 ; + int arg4 ; + int arg5 ; + bool temp2 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullPen, SWIGTYPE_p_wxPen, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:ColourDatabase_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; } -static int _wrap_NullBrush_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullBrush is read-only."); - return 1; +static PyObject * ColourDatabase_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxColourDatabase, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); } - - -static PyObject *_wrap_NullBrush_get() { - PyObject *pyobj; +static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "font", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullBrush, SWIGTYPE_p_wxBrush, 0); - return pyobj; -} - - -static int _wrap_NullPalette_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullPalette is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AddFont(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_NullPalette_get() { - PyObject *pyobj; +static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; + bool arg6 = (bool) False ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + int arg8 = (int) wxFONTENCODING_DEFAULT ; + wxFont *result; + bool temp7 = 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 *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullPalette, SWIGTYPE_p_wxPalette, 0); - return pyobj; -} - - -static int _wrap_NullFont_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullFont is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:FontList_FindOrCreateFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (bool) SWIG_PyObj_AsBool(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = True; + } + } + if (obj7) { + { + arg8 = (wxFontEncoding) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,(wxFontEncoding )arg8); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; } -static PyObject *_wrap_NullFont_get() { - PyObject *pyobj; +static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "font", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullFont, SWIGTYPE_p_wxFont, 0); - return pyobj; -} - - -static int _wrap_NullColour_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullColour is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemoveFont(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_NullColour_get() { - PyObject *pyobj; +static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullColour, SWIGTYPE_p_wxColour, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + return resultobj; + fail: + return NULL; } -static int _wrap_TheFontList_set(PyObject *_val) { +static PyObject * FontList_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxFontList, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static int _wrap_TheFontList_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheFontList is read-only."); return 1; } @@ -15591,7 +16883,7 @@ static PyObject *_wrap_TheFontList_get() { } -static int _wrap_ThePenList_set(PyObject *_val) { +static int _wrap_ThePenList_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ThePenList is read-only."); return 1; } @@ -15605,7 +16897,7 @@ static PyObject *_wrap_ThePenList_get() { } -static int _wrap_TheBrushList_set(PyObject *_val) { +static int _wrap_TheBrushList_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheBrushList is read-only."); return 1; } @@ -15619,7 +16911,7 @@ static PyObject *_wrap_TheBrushList_get() { } -static int _wrap_TheColourDatabase_set(PyObject *_val) { +static int _wrap_TheColourDatabase_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheColourDatabase is read-only."); return 1; } @@ -16024,11 +17316,12 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "rect",(char *) "borderSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -16038,6 +17331,12 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py arg3 = &temp3; if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSunkenEdge(*arg2,(wxRect const &)*arg3,arg4); @@ -16089,7 +17388,7 @@ static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17024,6 +18323,7 @@ static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxBuf static swig_type_info _swigt__p_wxMirrorDC[] = {{"_p_wxMirrorDC", 0, "wxMirrorDC *", 0},{"_p_wxMirrorDC"},{0}}; static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "byte *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; static swig_type_info _swigt__p_wxPyFontEnumerator[] = {{"_p_wxPyFontEnumerator", 0, "wxPyFontEnumerator *", 0},{"_p_wxPyFontEnumerator"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxIconLocation[] = {{"_p_wxIconLocation", 0, "wxIconLocation *", 0},{"_p_wxIconLocation"},{0}}; static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0},{"_p_wxImage"},{0}}; static swig_type_info _swigt__p_wxMetaFileDC[] = {{"_p_wxMetaFileDC", 0, "wxMetaFileDC *", 0},{"_p_wxMetaFileDC"},{0}}; @@ -17053,8 +18353,8 @@ static swig_type_info _swigt__p_wxBufferedDC[] = {{"_p_wxBufferedDC", 0, "wxBuff static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}}; static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; static swig_type_info _swigt__p_wxGDIObject[] = {{"_p_wxGDIObject", 0, "wxGDIObject *", 0},{"_p_wxIcon", _p_wxIconTo_p_wxGDIObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxGDIObject},{"_p_wxPen", _p_wxPenTo_p_wxGDIObject},{"_p_wxFont", _p_wxFontTo_p_wxGDIObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxGDIObject},{"_p_wxGDIObject"},{"_p_wxCursor", _p_wxCursorTo_p_wxGDIObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxGDIObject},{"_p_wxRegion", _p_wxRegionTo_p_wxGDIObject},{"_p_wxBrush", _p_wxBrushTo_p_wxGDIObject},{0}}; -static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0},{"_p_wxLocale"},{0}}; static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0},{"_p_wxIcon"},{0}}; +static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0},{"_p_wxLocale"},{0}}; static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0},{"_p_wxRegion"},{0}}; static swig_type_info _swigt__p_wxLanguageInfo[] = {{"_p_wxLanguageInfo", 0, "wxLanguageInfo *", 0},{"_p_wxLanguageInfo"},{0}}; static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0},{"_p_wxConfigBase"},{0}}; @@ -17081,6 +18381,7 @@ _swigt__p_wxDC, _swigt__p_wxMirrorDC, _swigt__p_byte, _swigt__p_wxPyFontEnumerator, +_swigt__p_char, _swigt__p_wxIconLocation, _swigt__p_wxImage, _swigt__p_wxMetaFileDC, @@ -17110,8 +18411,8 @@ _swigt__p_wxBufferedDC, _swigt__p_wxImageList, _swigt__p_unsigned_char, _swigt__p_wxGDIObject, -_swigt__p_wxLocale, _swigt__p_wxIcon, +_swigt__p_wxLocale, _swigt__p_wxRegion, _swigt__p_wxLanguageInfo, _swigt__p_wxConfigBase, @@ -17136,385 +18437,6 @@ _swigt__p_wxColourDatabase, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"OutRegion", (long) wxOutRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PartRegion", (long) wxPartRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"InRegion", (long) wxInRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_DEFAULT", (long) wxFONTFAMILY_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_DECORATIVE", (long) wxFONTFAMILY_DECORATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_ROMAN", (long) wxFONTFAMILY_ROMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_SCRIPT", (long) wxFONTFAMILY_SCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_SWISS", (long) wxFONTFAMILY_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_MODERN", (long) wxFONTFAMILY_MODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_TELETYPE", (long) wxFONTFAMILY_TELETYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_MAX", (long) wxFONTFAMILY_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_UNKNOWN", (long) wxFONTFAMILY_UNKNOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_NORMAL", (long) wxFONTSTYLE_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_ITALIC", (long) wxFONTSTYLE_ITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_SLANT", (long) wxFONTSTYLE_SLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_MAX", (long) wxFONTSTYLE_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_NORMAL", (long) wxFONTWEIGHT_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_LIGHT", (long) wxFONTWEIGHT_LIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_BOLD", (long) wxFONTWEIGHT_BOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_MAX", (long) wxFONTWEIGHT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_DEFAULT", (long) wxFONTFLAG_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_ITALIC", (long) wxFONTFLAG_ITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_SLANT", (long) wxFONTFLAG_SLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_LIGHT", (long) wxFONTFLAG_LIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_BOLD", (long) wxFONTFLAG_BOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_ANTIALIASED", (long) wxFONTFLAG_ANTIALIASED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_NOT_ANTIALIASED", (long) wxFONTFLAG_NOT_ANTIALIASED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_UNDERLINED", (long) wxFONTFLAG_UNDERLINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_STRIKETHROUGH", (long) wxFONTFLAG_STRIKETHROUGH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_MASK", (long) wxFONTFLAG_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_SYSTEM", (long) wxFONTENCODING_SYSTEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_DEFAULT", (long) wxFONTENCODING_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_1", (long) wxFONTENCODING_ISO8859_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_2", (long) wxFONTENCODING_ISO8859_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_3", (long) wxFONTENCODING_ISO8859_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_4", (long) wxFONTENCODING_ISO8859_4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_5", (long) wxFONTENCODING_ISO8859_5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_6", (long) wxFONTENCODING_ISO8859_6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_7", (long) wxFONTENCODING_ISO8859_7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_8", (long) wxFONTENCODING_ISO8859_8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_9", (long) wxFONTENCODING_ISO8859_9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_10", (long) wxFONTENCODING_ISO8859_10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_11", (long) wxFONTENCODING_ISO8859_11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_12", (long) wxFONTENCODING_ISO8859_12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_13", (long) wxFONTENCODING_ISO8859_13, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_14", (long) wxFONTENCODING_ISO8859_14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_15", (long) wxFONTENCODING_ISO8859_15, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_MAX", (long) wxFONTENCODING_ISO8859_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_KOI8", (long) wxFONTENCODING_KOI8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ALTERNATIVE", (long) wxFONTENCODING_ALTERNATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_BULGARIAN", (long) wxFONTENCODING_BULGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP437", (long) wxFONTENCODING_CP437, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP850", (long) wxFONTENCODING_CP850, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP852", (long) wxFONTENCODING_CP852, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP855", (long) wxFONTENCODING_CP855, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP866", (long) wxFONTENCODING_CP866, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP874", (long) wxFONTENCODING_CP874, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP932", (long) wxFONTENCODING_CP932, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP936", (long) wxFONTENCODING_CP936, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP949", (long) wxFONTENCODING_CP949, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP950", (long) wxFONTENCODING_CP950, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1250", (long) wxFONTENCODING_CP1250, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1251", (long) wxFONTENCODING_CP1251, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1252", (long) wxFONTENCODING_CP1252, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1253", (long) wxFONTENCODING_CP1253, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1254", (long) wxFONTENCODING_CP1254, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1255", (long) wxFONTENCODING_CP1255, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1256", (long) wxFONTENCODING_CP1256, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1257", (long) wxFONTENCODING_CP1257, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP12_MAX", (long) wxFONTENCODING_CP12_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF7", (long) wxFONTENCODING_UTF7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF8", (long) wxFONTENCODING_UTF8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_EUC_JP", (long) wxFONTENCODING_EUC_JP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16BE", (long) wxFONTENCODING_UTF16BE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16LE", (long) wxFONTENCODING_UTF16LE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32BE", (long) wxFONTENCODING_UTF32BE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32LE", (long) wxFONTENCODING_UTF32LE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACROMAN", (long) wxFONTENCODING_MACROMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACJAPANESE", (long) wxFONTENCODING_MACJAPANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCHINESETRAD", (long) wxFONTENCODING_MACCHINESETRAD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACKOREAN", (long) wxFONTENCODING_MACKOREAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACARABIC", (long) wxFONTENCODING_MACARABIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACHEBREW", (long) wxFONTENCODING_MACHEBREW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGREEK", (long) wxFONTENCODING_MACGREEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCYRILLIC", (long) wxFONTENCODING_MACCYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACDEVANAGARI", (long) wxFONTENCODING_MACDEVANAGARI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGURMUKHI", (long) wxFONTENCODING_MACGURMUKHI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGUJARATI", (long) wxFONTENCODING_MACGUJARATI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACORIYA", (long) wxFONTENCODING_MACORIYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACBENGALI", (long) wxFONTENCODING_MACBENGALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTAMIL", (long) wxFONTENCODING_MACTAMIL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTELUGU", (long) wxFONTENCODING_MACTELUGU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACKANNADA", (long) wxFONTENCODING_MACKANNADA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACMALAJALAM", (long) wxFONTENCODING_MACMALAJALAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACSINHALESE", (long) wxFONTENCODING_MACSINHALESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACBURMESE", (long) wxFONTENCODING_MACBURMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACKHMER", (long) wxFONTENCODING_MACKHMER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTHAI", (long) wxFONTENCODING_MACTHAI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACLAOTIAN", (long) wxFONTENCODING_MACLAOTIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGEORGIAN", (long) wxFONTENCODING_MACGEORGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACARMENIAN", (long) wxFONTENCODING_MACARMENIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCHINESESIMP", (long) wxFONTENCODING_MACCHINESESIMP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTIBETAN", (long) wxFONTENCODING_MACTIBETAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACMONGOLIAN", (long) wxFONTENCODING_MACMONGOLIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACETHIOPIC", (long) wxFONTENCODING_MACETHIOPIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCENTRALEUR", (long) wxFONTENCODING_MACCENTRALEUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACVIATNAMESE", (long) wxFONTENCODING_MACVIATNAMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACARABICEXT", (long) wxFONTENCODING_MACARABICEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACSYMBOL", (long) wxFONTENCODING_MACSYMBOL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACDINGBATS", (long) wxFONTENCODING_MACDINGBATS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTURKISH", (long) wxFONTENCODING_MACTURKISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCROATIAN", (long) wxFONTENCODING_MACCROATIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACICELANDIC", (long) wxFONTENCODING_MACICELANDIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACROMANIAN", (long) wxFONTENCODING_MACROMANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCELTIC", (long) wxFONTENCODING_MACCELTIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGAELIC", (long) wxFONTENCODING_MACGAELIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACKEYBOARD", (long) wxFONTENCODING_MACKEYBOARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACMIN", (long) wxFONTENCODING_MACMIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACMAX", (long) wxFONTENCODING_MACMAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MAX", (long) wxFONTENCODING_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16", (long) wxFONTENCODING_UTF16, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32", (long) wxFONTENCODING_UTF32, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UNICODE", (long) wxFONTENCODING_UNICODE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_GB2312", (long) wxFONTENCODING_GB2312, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_BIG5", (long) wxFONTENCODING_BIG5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_SHIFT_JIS", (long) wxFONTENCODING_SHIFT_JIS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DEFAULT", (long) wxLANGUAGE_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UNKNOWN", (long) wxLANGUAGE_UNKNOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ABKHAZIAN", (long) wxLANGUAGE_ABKHAZIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AFAR", (long) wxLANGUAGE_AFAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AFRIKAANS", (long) wxLANGUAGE_AFRIKAANS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ALBANIAN", (long) wxLANGUAGE_ALBANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AMHARIC", (long) wxLANGUAGE_AMHARIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC", (long) wxLANGUAGE_ARABIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_ALGERIA", (long) wxLANGUAGE_ARABIC_ALGERIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_BAHRAIN", (long) wxLANGUAGE_ARABIC_BAHRAIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_EGYPT", (long) wxLANGUAGE_ARABIC_EGYPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_IRAQ", (long) wxLANGUAGE_ARABIC_IRAQ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_JORDAN", (long) wxLANGUAGE_ARABIC_JORDAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_KUWAIT", (long) wxLANGUAGE_ARABIC_KUWAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_LEBANON", (long) wxLANGUAGE_ARABIC_LEBANON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_LIBYA", (long) wxLANGUAGE_ARABIC_LIBYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_MOROCCO", (long) wxLANGUAGE_ARABIC_MOROCCO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_OMAN", (long) wxLANGUAGE_ARABIC_OMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_QATAR", (long) wxLANGUAGE_ARABIC_QATAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SAUDI_ARABIA", (long) wxLANGUAGE_ARABIC_SAUDI_ARABIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SUDAN", (long) wxLANGUAGE_ARABIC_SUDAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SYRIA", (long) wxLANGUAGE_ARABIC_SYRIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_TUNISIA", (long) wxLANGUAGE_ARABIC_TUNISIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_UAE", (long) wxLANGUAGE_ARABIC_UAE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_YEMEN", (long) wxLANGUAGE_ARABIC_YEMEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARMENIAN", (long) wxLANGUAGE_ARMENIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ASSAMESE", (long) wxLANGUAGE_ASSAMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AYMARA", (long) wxLANGUAGE_AYMARA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI", (long) wxLANGUAGE_AZERI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI_CYRILLIC", (long) wxLANGUAGE_AZERI_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI_LATIN", (long) wxLANGUAGE_AZERI_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BASHKIR", (long) wxLANGUAGE_BASHKIR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BASQUE", (long) wxLANGUAGE_BASQUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BELARUSIAN", (long) wxLANGUAGE_BELARUSIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BENGALI", (long) wxLANGUAGE_BENGALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BHUTANI", (long) wxLANGUAGE_BHUTANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BIHARI", (long) wxLANGUAGE_BIHARI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BISLAMA", (long) wxLANGUAGE_BISLAMA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BRETON", (long) wxLANGUAGE_BRETON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BULGARIAN", (long) wxLANGUAGE_BULGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BURMESE", (long) wxLANGUAGE_BURMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CAMBODIAN", (long) wxLANGUAGE_CAMBODIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CATALAN", (long) wxLANGUAGE_CATALAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE", (long) wxLANGUAGE_CHINESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_SIMPLIFIED", (long) wxLANGUAGE_CHINESE_SIMPLIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_TRADITIONAL", (long) wxLANGUAGE_CHINESE_TRADITIONAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_HONGKONG", (long) wxLANGUAGE_CHINESE_HONGKONG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_MACAU", (long) wxLANGUAGE_CHINESE_MACAU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_SINGAPORE", (long) wxLANGUAGE_CHINESE_SINGAPORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_TAIWAN", (long) wxLANGUAGE_CHINESE_TAIWAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CORSICAN", (long) wxLANGUAGE_CORSICAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CROATIAN", (long) wxLANGUAGE_CROATIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CZECH", (long) wxLANGUAGE_CZECH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DANISH", (long) wxLANGUAGE_DANISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DUTCH", (long) wxLANGUAGE_DUTCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DUTCH_BELGIAN", (long) wxLANGUAGE_DUTCH_BELGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH", (long) wxLANGUAGE_ENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_UK", (long) wxLANGUAGE_ENGLISH_UK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_US", (long) wxLANGUAGE_ENGLISH_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_AUSTRALIA", (long) wxLANGUAGE_ENGLISH_AUSTRALIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_BELIZE", (long) wxLANGUAGE_ENGLISH_BELIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_BOTSWANA", (long) wxLANGUAGE_ENGLISH_BOTSWANA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_CANADA", (long) wxLANGUAGE_ENGLISH_CANADA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_CARIBBEAN", (long) wxLANGUAGE_ENGLISH_CARIBBEAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_DENMARK", (long) wxLANGUAGE_ENGLISH_DENMARK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_EIRE", (long) wxLANGUAGE_ENGLISH_EIRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_JAMAICA", (long) wxLANGUAGE_ENGLISH_JAMAICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_NEW_ZEALAND", (long) wxLANGUAGE_ENGLISH_NEW_ZEALAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_PHILIPPINES", (long) wxLANGUAGE_ENGLISH_PHILIPPINES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_SOUTH_AFRICA", (long) wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_TRINIDAD", (long) wxLANGUAGE_ENGLISH_TRINIDAD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_ZIMBABWE", (long) wxLANGUAGE_ENGLISH_ZIMBABWE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ESPERANTO", (long) wxLANGUAGE_ESPERANTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ESTONIAN", (long) wxLANGUAGE_ESTONIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FAEROESE", (long) wxLANGUAGE_FAEROESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FARSI", (long) wxLANGUAGE_FARSI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FIJI", (long) wxLANGUAGE_FIJI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FINNISH", (long) wxLANGUAGE_FINNISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH", (long) wxLANGUAGE_FRENCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_BELGIAN", (long) wxLANGUAGE_FRENCH_BELGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_CANADIAN", (long) wxLANGUAGE_FRENCH_CANADIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_LUXEMBOURG", (long) wxLANGUAGE_FRENCH_LUXEMBOURG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_MONACO", (long) wxLANGUAGE_FRENCH_MONACO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_SWISS", (long) wxLANGUAGE_FRENCH_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRISIAN", (long) wxLANGUAGE_FRISIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GALICIAN", (long) wxLANGUAGE_GALICIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GEORGIAN", (long) wxLANGUAGE_GEORGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN", (long) wxLANGUAGE_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_AUSTRIAN", (long) wxLANGUAGE_GERMAN_AUSTRIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_BELGIUM", (long) wxLANGUAGE_GERMAN_BELGIUM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_LIECHTENSTEIN", (long) wxLANGUAGE_GERMAN_LIECHTENSTEIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_LUXEMBOURG", (long) wxLANGUAGE_GERMAN_LUXEMBOURG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_SWISS", (long) wxLANGUAGE_GERMAN_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GREEK", (long) wxLANGUAGE_GREEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GREENLANDIC", (long) wxLANGUAGE_GREENLANDIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GUARANI", (long) wxLANGUAGE_GUARANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GUJARATI", (long) wxLANGUAGE_GUJARATI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HAUSA", (long) wxLANGUAGE_HAUSA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HEBREW", (long) wxLANGUAGE_HEBREW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HINDI", (long) wxLANGUAGE_HINDI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HUNGARIAN", (long) wxLANGUAGE_HUNGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ICELANDIC", (long) wxLANGUAGE_ICELANDIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INDONESIAN", (long) wxLANGUAGE_INDONESIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INTERLINGUA", (long) wxLANGUAGE_INTERLINGUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INTERLINGUE", (long) wxLANGUAGE_INTERLINGUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INUKTITUT", (long) wxLANGUAGE_INUKTITUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INUPIAK", (long) wxLANGUAGE_INUPIAK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_IRISH", (long) wxLANGUAGE_IRISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ITALIAN", (long) wxLANGUAGE_ITALIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ITALIAN_SWISS", (long) wxLANGUAGE_ITALIAN_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_JAPANESE", (long) wxLANGUAGE_JAPANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_JAVANESE", (long) wxLANGUAGE_JAVANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KANNADA", (long) wxLANGUAGE_KANNADA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KASHMIRI", (long) wxLANGUAGE_KASHMIRI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KASHMIRI_INDIA", (long) wxLANGUAGE_KASHMIRI_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KAZAKH", (long) wxLANGUAGE_KAZAKH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KERNEWEK", (long) wxLANGUAGE_KERNEWEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KINYARWANDA", (long) wxLANGUAGE_KINYARWANDA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KIRGHIZ", (long) wxLANGUAGE_KIRGHIZ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KIRUNDI", (long) wxLANGUAGE_KIRUNDI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KONKANI", (long) wxLANGUAGE_KONKANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KOREAN", (long) wxLANGUAGE_KOREAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KURDISH", (long) wxLANGUAGE_KURDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LAOTHIAN", (long) wxLANGUAGE_LAOTHIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LATIN", (long) wxLANGUAGE_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LATVIAN", (long) wxLANGUAGE_LATVIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LINGALA", (long) wxLANGUAGE_LINGALA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LITHUANIAN", (long) wxLANGUAGE_LITHUANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MACEDONIAN", (long) wxLANGUAGE_MACEDONIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAGASY", (long) wxLANGUAGE_MALAGASY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY", (long) wxLANGUAGE_MALAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAYALAM", (long) wxLANGUAGE_MALAYALAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", (long) wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY_MALAYSIA", (long) wxLANGUAGE_MALAY_MALAYSIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALTESE", (long) wxLANGUAGE_MALTESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MANIPURI", (long) wxLANGUAGE_MANIPURI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MAORI", (long) wxLANGUAGE_MAORI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MARATHI", (long) wxLANGUAGE_MARATHI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MOLDAVIAN", (long) wxLANGUAGE_MOLDAVIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MONGOLIAN", (long) wxLANGUAGE_MONGOLIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NAURU", (long) wxLANGUAGE_NAURU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NEPALI", (long) wxLANGUAGE_NEPALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NEPALI_INDIA", (long) wxLANGUAGE_NEPALI_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NORWEGIAN_BOKMAL", (long) wxLANGUAGE_NORWEGIAN_BOKMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NORWEGIAN_NYNORSK", (long) wxLANGUAGE_NORWEGIAN_NYNORSK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_OCCITAN", (long) wxLANGUAGE_OCCITAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ORIYA", (long) wxLANGUAGE_ORIYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_OROMO", (long) wxLANGUAGE_OROMO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PASHTO", (long) wxLANGUAGE_PASHTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_POLISH", (long) wxLANGUAGE_POLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PORTUGUESE", (long) wxLANGUAGE_PORTUGUESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PORTUGUESE_BRAZILIAN", (long) wxLANGUAGE_PORTUGUESE_BRAZILIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PUNJABI", (long) wxLANGUAGE_PUNJABI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_QUECHUA", (long) wxLANGUAGE_QUECHUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RHAETO_ROMANCE", (long) wxLANGUAGE_RHAETO_ROMANCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ROMANIAN", (long) wxLANGUAGE_ROMANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RUSSIAN", (long) wxLANGUAGE_RUSSIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RUSSIAN_UKRAINE", (long) wxLANGUAGE_RUSSIAN_UKRAINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SAMOAN", (long) wxLANGUAGE_SAMOAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SANGHO", (long) wxLANGUAGE_SANGHO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SANSKRIT", (long) wxLANGUAGE_SANSKRIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SCOTS_GAELIC", (long) wxLANGUAGE_SCOTS_GAELIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN", (long) wxLANGUAGE_SERBIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN_CYRILLIC", (long) wxLANGUAGE_SERBIAN_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN_LATIN", (long) wxLANGUAGE_SERBIAN_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBO_CROATIAN", (long) wxLANGUAGE_SERBO_CROATIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SESOTHO", (long) wxLANGUAGE_SESOTHO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SETSWANA", (long) wxLANGUAGE_SETSWANA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SHONA", (long) wxLANGUAGE_SHONA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SINDHI", (long) wxLANGUAGE_SINDHI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SINHALESE", (long) wxLANGUAGE_SINHALESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SISWATI", (long) wxLANGUAGE_SISWATI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SLOVAK", (long) wxLANGUAGE_SLOVAK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SLOVENIAN", (long) wxLANGUAGE_SLOVENIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SOMALI", (long) wxLANGUAGE_SOMALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH", (long) wxLANGUAGE_SPANISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_ARGENTINA", (long) wxLANGUAGE_SPANISH_ARGENTINA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_BOLIVIA", (long) wxLANGUAGE_SPANISH_BOLIVIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_CHILE", (long) wxLANGUAGE_SPANISH_CHILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_COLOMBIA", (long) wxLANGUAGE_SPANISH_COLOMBIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_COSTA_RICA", (long) wxLANGUAGE_SPANISH_COSTA_RICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", (long) wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_ECUADOR", (long) wxLANGUAGE_SPANISH_ECUADOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_EL_SALVADOR", (long) wxLANGUAGE_SPANISH_EL_SALVADOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_GUATEMALA", (long) wxLANGUAGE_SPANISH_GUATEMALA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_HONDURAS", (long) wxLANGUAGE_SPANISH_HONDURAS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_MEXICAN", (long) wxLANGUAGE_SPANISH_MEXICAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_MODERN", (long) wxLANGUAGE_SPANISH_MODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_NICARAGUA", (long) wxLANGUAGE_SPANISH_NICARAGUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PANAMA", (long) wxLANGUAGE_SPANISH_PANAMA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PARAGUAY", (long) wxLANGUAGE_SPANISH_PARAGUAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PERU", (long) wxLANGUAGE_SPANISH_PERU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PUERTO_RICO", (long) wxLANGUAGE_SPANISH_PUERTO_RICO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_URUGUAY", (long) wxLANGUAGE_SPANISH_URUGUAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_US", (long) wxLANGUAGE_SPANISH_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_VENEZUELA", (long) wxLANGUAGE_SPANISH_VENEZUELA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SUNDANESE", (long) wxLANGUAGE_SUNDANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWAHILI", (long) wxLANGUAGE_SWAHILI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWEDISH", (long) wxLANGUAGE_SWEDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWEDISH_FINLAND", (long) wxLANGUAGE_SWEDISH_FINLAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAGALOG", (long) wxLANGUAGE_TAGALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAJIK", (long) wxLANGUAGE_TAJIK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAMIL", (long) wxLANGUAGE_TAMIL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TATAR", (long) wxLANGUAGE_TATAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TELUGU", (long) wxLANGUAGE_TELUGU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_THAI", (long) wxLANGUAGE_THAI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TIBETAN", (long) wxLANGUAGE_TIBETAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TIGRINYA", (long) wxLANGUAGE_TIGRINYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TONGA", (long) wxLANGUAGE_TONGA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TSONGA", (long) wxLANGUAGE_TSONGA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TURKISH", (long) wxLANGUAGE_TURKISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TURKMEN", (long) wxLANGUAGE_TURKMEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TWI", (long) wxLANGUAGE_TWI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UIGHUR", (long) wxLANGUAGE_UIGHUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UKRAINIAN", (long) wxLANGUAGE_UKRAINIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU", (long) wxLANGUAGE_URDU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU_INDIA", (long) wxLANGUAGE_URDU_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU_PAKISTAN", (long) wxLANGUAGE_URDU_PAKISTAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK", (long) wxLANGUAGE_UZBEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK_CYRILLIC", (long) wxLANGUAGE_UZBEK_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK_LATIN", (long) wxLANGUAGE_UZBEK_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_VIETNAMESE", (long) wxLANGUAGE_VIETNAMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_VOLAPUK", (long) wxLANGUAGE_VOLAPUK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_WELSH", (long) wxLANGUAGE_WELSH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_WOLOF", (long) wxLANGUAGE_WOLOF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_XHOSA", (long) wxLANGUAGE_XHOSA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_YIDDISH", (long) wxLANGUAGE_YIDDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_YORUBA", (long) wxLANGUAGE_YORUBA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ZHUANG", (long) wxLANGUAGE_ZHUANG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ZULU", (long) wxLANGUAGE_ZULU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_USER_DEFINED", (long) wxLANGUAGE_USER_DEFINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_NUMBER", (long) wxLOCALE_CAT_NUMBER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_DATE", (long) wxLOCALE_CAT_DATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_MONEY", (long) wxLOCALE_CAT_MONEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_MAX", (long) wxLOCALE_CAT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_THOUSANDS_SEP", (long) wxLOCALE_THOUSANDS_SEP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_DECIMAL_POINT", (long) wxLOCALE_DECIMAL_POINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_LOAD_DEFAULT", (long) wxLOCALE_LOAD_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CONV_ENCODING", (long) wxLOCALE_CONV_ENCODING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONVERT_STRICT", (long) wxCONVERT_STRICT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONVERT_SUBSTITUTE", (long) wxCONVERT_SUBSTITUTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_CURRENT", (long) wxPLATFORM_CURRENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_UNIX", (long) wxPLATFORM_UNIX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_WINDOWS", (long) wxPLATFORM_WINDOWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_OS2", (long) wxPLATFORM_OS2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_MAC", (long) wxPLATFORM_MAC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_NORMAL", (long) wxIMAGELIST_DRAW_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_TRANSPARENT", (long) wxIMAGELIST_DRAW_TRANSPARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_SELECTED", (long) wxIMAGELIST_DRAW_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_FOCUSED", (long) wxIMAGELIST_DRAW_FOCUSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_NORMAL", (long) wxIMAGE_LIST_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_SMALL", (long) wxIMAGE_LIST_SMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_STATE", (long) wxIMAGE_LIST_STATE, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -17541,9 +18463,388 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"OutRegion", SWIG_PyObj_FromInt((int)wxOutRegion)); + PyDict_SetItemString(d,"PartRegion", SWIG_PyObj_FromInt((int)wxPartRegion)); + PyDict_SetItemString(d,"InRegion", SWIG_PyObj_FromInt((int)wxInRegion)); + PyDict_SetItemString(d,"FONTFAMILY_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTFAMILY_DEFAULT)); + PyDict_SetItemString(d,"FONTFAMILY_DECORATIVE", SWIG_PyObj_FromInt((int)wxFONTFAMILY_DECORATIVE)); + PyDict_SetItemString(d,"FONTFAMILY_ROMAN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_ROMAN)); + PyDict_SetItemString(d,"FONTFAMILY_SCRIPT", SWIG_PyObj_FromInt((int)wxFONTFAMILY_SCRIPT)); + PyDict_SetItemString(d,"FONTFAMILY_SWISS", SWIG_PyObj_FromInt((int)wxFONTFAMILY_SWISS)); + PyDict_SetItemString(d,"FONTFAMILY_MODERN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_MODERN)); + PyDict_SetItemString(d,"FONTFAMILY_TELETYPE", SWIG_PyObj_FromInt((int)wxFONTFAMILY_TELETYPE)); + PyDict_SetItemString(d,"FONTFAMILY_MAX", SWIG_PyObj_FromInt((int)wxFONTFAMILY_MAX)); + PyDict_SetItemString(d,"FONTFAMILY_UNKNOWN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_UNKNOWN)); + PyDict_SetItemString(d,"FONTSTYLE_NORMAL", SWIG_PyObj_FromInt((int)wxFONTSTYLE_NORMAL)); + PyDict_SetItemString(d,"FONTSTYLE_ITALIC", SWIG_PyObj_FromInt((int)wxFONTSTYLE_ITALIC)); + PyDict_SetItemString(d,"FONTSTYLE_SLANT", SWIG_PyObj_FromInt((int)wxFONTSTYLE_SLANT)); + PyDict_SetItemString(d,"FONTSTYLE_MAX", SWIG_PyObj_FromInt((int)wxFONTSTYLE_MAX)); + PyDict_SetItemString(d,"FONTWEIGHT_NORMAL", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_NORMAL)); + PyDict_SetItemString(d,"FONTWEIGHT_LIGHT", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_LIGHT)); + PyDict_SetItemString(d,"FONTWEIGHT_BOLD", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_BOLD)); + PyDict_SetItemString(d,"FONTWEIGHT_MAX", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_MAX)); + PyDict_SetItemString(d,"FONTFLAG_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTFLAG_DEFAULT)); + PyDict_SetItemString(d,"FONTFLAG_ITALIC", SWIG_PyObj_FromInt((int)wxFONTFLAG_ITALIC)); + PyDict_SetItemString(d,"FONTFLAG_SLANT", SWIG_PyObj_FromInt((int)wxFONTFLAG_SLANT)); + PyDict_SetItemString(d,"FONTFLAG_LIGHT", SWIG_PyObj_FromInt((int)wxFONTFLAG_LIGHT)); + PyDict_SetItemString(d,"FONTFLAG_BOLD", SWIG_PyObj_FromInt((int)wxFONTFLAG_BOLD)); + PyDict_SetItemString(d,"FONTFLAG_ANTIALIASED", SWIG_PyObj_FromInt((int)wxFONTFLAG_ANTIALIASED)); + PyDict_SetItemString(d,"FONTFLAG_NOT_ANTIALIASED", SWIG_PyObj_FromInt((int)wxFONTFLAG_NOT_ANTIALIASED)); + PyDict_SetItemString(d,"FONTFLAG_UNDERLINED", SWIG_PyObj_FromInt((int)wxFONTFLAG_UNDERLINED)); + PyDict_SetItemString(d,"FONTFLAG_STRIKETHROUGH", SWIG_PyObj_FromInt((int)wxFONTFLAG_STRIKETHROUGH)); + PyDict_SetItemString(d,"FONTFLAG_MASK", SWIG_PyObj_FromInt((int)wxFONTFLAG_MASK)); + PyDict_SetItemString(d,"FONTENCODING_SYSTEM", SWIG_PyObj_FromInt((int)wxFONTENCODING_SYSTEM)); + PyDict_SetItemString(d,"FONTENCODING_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTENCODING_DEFAULT)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_1", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_1)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_2", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_2)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_3", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_3)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_4", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_4)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_5", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_5)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_6", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_6)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_7", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_7)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_8", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_8)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_9", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_9)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_10", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_10)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_11", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_11)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_12", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_12)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_13", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_13)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_14", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_14)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_15", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_15)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_MAX)); + PyDict_SetItemString(d,"FONTENCODING_KOI8", SWIG_PyObj_FromInt((int)wxFONTENCODING_KOI8)); + PyDict_SetItemString(d,"FONTENCODING_ALTERNATIVE", SWIG_PyObj_FromInt((int)wxFONTENCODING_ALTERNATIVE)); + PyDict_SetItemString(d,"FONTENCODING_BULGARIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_BULGARIAN)); + PyDict_SetItemString(d,"FONTENCODING_CP437", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP437)); + PyDict_SetItemString(d,"FONTENCODING_CP850", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP850)); + PyDict_SetItemString(d,"FONTENCODING_CP852", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP852)); + PyDict_SetItemString(d,"FONTENCODING_CP855", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP855)); + PyDict_SetItemString(d,"FONTENCODING_CP866", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP866)); + PyDict_SetItemString(d,"FONTENCODING_CP874", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP874)); + PyDict_SetItemString(d,"FONTENCODING_CP932", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP932)); + PyDict_SetItemString(d,"FONTENCODING_CP936", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP936)); + PyDict_SetItemString(d,"FONTENCODING_CP949", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP949)); + PyDict_SetItemString(d,"FONTENCODING_CP950", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP950)); + PyDict_SetItemString(d,"FONTENCODING_CP1250", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1250)); + PyDict_SetItemString(d,"FONTENCODING_CP1251", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1251)); + PyDict_SetItemString(d,"FONTENCODING_CP1252", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1252)); + PyDict_SetItemString(d,"FONTENCODING_CP1253", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1253)); + PyDict_SetItemString(d,"FONTENCODING_CP1254", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1254)); + PyDict_SetItemString(d,"FONTENCODING_CP1255", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1255)); + PyDict_SetItemString(d,"FONTENCODING_CP1256", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1256)); + PyDict_SetItemString(d,"FONTENCODING_CP1257", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1257)); + PyDict_SetItemString(d,"FONTENCODING_CP12_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP12_MAX)); + PyDict_SetItemString(d,"FONTENCODING_UTF7", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF7)); + PyDict_SetItemString(d,"FONTENCODING_UTF8", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF8)); + PyDict_SetItemString(d,"FONTENCODING_EUC_JP", SWIG_PyObj_FromInt((int)wxFONTENCODING_EUC_JP)); + PyDict_SetItemString(d,"FONTENCODING_UTF16BE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16BE)); + PyDict_SetItemString(d,"FONTENCODING_UTF16LE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16LE)); + PyDict_SetItemString(d,"FONTENCODING_UTF32BE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32BE)); + PyDict_SetItemString(d,"FONTENCODING_UTF32LE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32LE)); + PyDict_SetItemString(d,"FONTENCODING_MACROMAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACROMAN)); + PyDict_SetItemString(d,"FONTENCODING_MACJAPANESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACJAPANESE)); + PyDict_SetItemString(d,"FONTENCODING_MACCHINESETRAD", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCHINESETRAD)); + PyDict_SetItemString(d,"FONTENCODING_MACKOREAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKOREAN)); + PyDict_SetItemString(d,"FONTENCODING_MACARABIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARABIC)); + PyDict_SetItemString(d,"FONTENCODING_MACHEBREW", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACHEBREW)); + PyDict_SetItemString(d,"FONTENCODING_MACGREEK", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGREEK)); + PyDict_SetItemString(d,"FONTENCODING_MACCYRILLIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCYRILLIC)); + PyDict_SetItemString(d,"FONTENCODING_MACDEVANAGARI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACDEVANAGARI)); + PyDict_SetItemString(d,"FONTENCODING_MACGURMUKHI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGURMUKHI)); + PyDict_SetItemString(d,"FONTENCODING_MACGUJARATI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGUJARATI)); + PyDict_SetItemString(d,"FONTENCODING_MACORIYA", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACORIYA)); + PyDict_SetItemString(d,"FONTENCODING_MACBENGALI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACBENGALI)); + PyDict_SetItemString(d,"FONTENCODING_MACTAMIL", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTAMIL)); + PyDict_SetItemString(d,"FONTENCODING_MACTELUGU", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTELUGU)); + PyDict_SetItemString(d,"FONTENCODING_MACKANNADA", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKANNADA)); + PyDict_SetItemString(d,"FONTENCODING_MACMALAJALAM", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMALAJALAM)); + PyDict_SetItemString(d,"FONTENCODING_MACSINHALESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACSINHALESE)); + PyDict_SetItemString(d,"FONTENCODING_MACBURMESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACBURMESE)); + PyDict_SetItemString(d,"FONTENCODING_MACKHMER", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKHMER)); + PyDict_SetItemString(d,"FONTENCODING_MACTHAI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTHAI)); + PyDict_SetItemString(d,"FONTENCODING_MACLAOTIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACLAOTIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACGEORGIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGEORGIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACARMENIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARMENIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACCHINESESIMP", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCHINESESIMP)); + PyDict_SetItemString(d,"FONTENCODING_MACTIBETAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTIBETAN)); + PyDict_SetItemString(d,"FONTENCODING_MACMONGOLIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMONGOLIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACETHIOPIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACETHIOPIC)); + PyDict_SetItemString(d,"FONTENCODING_MACCENTRALEUR", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCENTRALEUR)); + PyDict_SetItemString(d,"FONTENCODING_MACVIATNAMESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACVIATNAMESE)); + PyDict_SetItemString(d,"FONTENCODING_MACARABICEXT", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARABICEXT)); + PyDict_SetItemString(d,"FONTENCODING_MACSYMBOL", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACSYMBOL)); + PyDict_SetItemString(d,"FONTENCODING_MACDINGBATS", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACDINGBATS)); + PyDict_SetItemString(d,"FONTENCODING_MACTURKISH", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTURKISH)); + PyDict_SetItemString(d,"FONTENCODING_MACCROATIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCROATIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACICELANDIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACICELANDIC)); + PyDict_SetItemString(d,"FONTENCODING_MACROMANIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACROMANIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACCELTIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCELTIC)); + PyDict_SetItemString(d,"FONTENCODING_MACGAELIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGAELIC)); + PyDict_SetItemString(d,"FONTENCODING_MACKEYBOARD", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKEYBOARD)); + PyDict_SetItemString(d,"FONTENCODING_MACMIN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMIN)); + PyDict_SetItemString(d,"FONTENCODING_MACMAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMAX)); + PyDict_SetItemString(d,"FONTENCODING_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_MAX)); + PyDict_SetItemString(d,"FONTENCODING_UTF16", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16)); + PyDict_SetItemString(d,"FONTENCODING_UTF32", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32)); + PyDict_SetItemString(d,"FONTENCODING_UNICODE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UNICODE)); + PyDict_SetItemString(d,"FONTENCODING_GB2312", SWIG_PyObj_FromInt((int)wxFONTENCODING_GB2312)); + PyDict_SetItemString(d,"FONTENCODING_BIG5", SWIG_PyObj_FromInt((int)wxFONTENCODING_BIG5)); + PyDict_SetItemString(d,"FONTENCODING_SHIFT_JIS", SWIG_PyObj_FromInt((int)wxFONTENCODING_SHIFT_JIS)); wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator"); + PyDict_SetItemString(d,"LANGUAGE_DEFAULT", SWIG_PyObj_FromInt((int)wxLANGUAGE_DEFAULT)); + PyDict_SetItemString(d,"LANGUAGE_UNKNOWN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UNKNOWN)); + PyDict_SetItemString(d,"LANGUAGE_ABKHAZIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ABKHAZIAN)); + PyDict_SetItemString(d,"LANGUAGE_AFAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_AFAR)); + PyDict_SetItemString(d,"LANGUAGE_AFRIKAANS", SWIG_PyObj_FromInt((int)wxLANGUAGE_AFRIKAANS)); + PyDict_SetItemString(d,"LANGUAGE_ALBANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ALBANIAN)); + PyDict_SetItemString(d,"LANGUAGE_AMHARIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_AMHARIC)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_ALGERIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_ALGERIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_BAHRAIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_BAHRAIN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_EGYPT", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_EGYPT)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_IRAQ", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_IRAQ)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_JORDAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_JORDAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_KUWAIT", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_KUWAIT)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_LEBANON", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_LEBANON)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_LIBYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_LIBYA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_MOROCCO", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_MOROCCO)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_OMAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_OMAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_QATAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_QATAR)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SAUDI_ARABIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SAUDI_ARABIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SUDAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SUDAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SYRIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SYRIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_TUNISIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_TUNISIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_UAE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_UAE)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_YEMEN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_YEMEN)); + PyDict_SetItemString(d,"LANGUAGE_ARMENIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARMENIAN)); + PyDict_SetItemString(d,"LANGUAGE_ASSAMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ASSAMESE)); + PyDict_SetItemString(d,"LANGUAGE_AYMARA", SWIG_PyObj_FromInt((int)wxLANGUAGE_AYMARA)); + PyDict_SetItemString(d,"LANGUAGE_AZERI", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI)); + PyDict_SetItemString(d,"LANGUAGE_AZERI_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_AZERI_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_BASHKIR", SWIG_PyObj_FromInt((int)wxLANGUAGE_BASHKIR)); + PyDict_SetItemString(d,"LANGUAGE_BASQUE", SWIG_PyObj_FromInt((int)wxLANGUAGE_BASQUE)); + PyDict_SetItemString(d,"LANGUAGE_BELARUSIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_BELARUSIAN)); + PyDict_SetItemString(d,"LANGUAGE_BENGALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BENGALI)); + PyDict_SetItemString(d,"LANGUAGE_BHUTANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BHUTANI)); + PyDict_SetItemString(d,"LANGUAGE_BIHARI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BIHARI)); + PyDict_SetItemString(d,"LANGUAGE_BISLAMA", SWIG_PyObj_FromInt((int)wxLANGUAGE_BISLAMA)); + PyDict_SetItemString(d,"LANGUAGE_BRETON", SWIG_PyObj_FromInt((int)wxLANGUAGE_BRETON)); + PyDict_SetItemString(d,"LANGUAGE_BULGARIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_BULGARIAN)); + PyDict_SetItemString(d,"LANGUAGE_BURMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_BURMESE)); + PyDict_SetItemString(d,"LANGUAGE_CAMBODIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CAMBODIAN)); + PyDict_SetItemString(d,"LANGUAGE_CATALAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CATALAN)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_SIMPLIFIED", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_SIMPLIFIED)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_TRADITIONAL", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_TRADITIONAL)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_HONGKONG", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_HONGKONG)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_MACAU", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_MACAU)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_SINGAPORE", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_SINGAPORE)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_TAIWAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_TAIWAN)); + PyDict_SetItemString(d,"LANGUAGE_CORSICAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CORSICAN)); + PyDict_SetItemString(d,"LANGUAGE_CROATIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CROATIAN)); + PyDict_SetItemString(d,"LANGUAGE_CZECH", SWIG_PyObj_FromInt((int)wxLANGUAGE_CZECH)); + PyDict_SetItemString(d,"LANGUAGE_DANISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_DANISH)); + PyDict_SetItemString(d,"LANGUAGE_DUTCH", SWIG_PyObj_FromInt((int)wxLANGUAGE_DUTCH)); + PyDict_SetItemString(d,"LANGUAGE_DUTCH_BELGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_DUTCH_BELGIAN)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_UK", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_UK)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_US", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_US)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_AUSTRALIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_AUSTRALIA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BELIZE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_BELIZE)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BOTSWANA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_BOTSWANA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CANADA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_CANADA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CARIBBEAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_CARIBBEAN)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_DENMARK", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_DENMARK)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_EIRE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_EIRE)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_JAMAICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_JAMAICA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_NEW_ZEALAND", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_NEW_ZEALAND)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_PHILIPPINES", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_PHILIPPINES)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_SOUTH_AFRICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_SOUTH_AFRICA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_TRINIDAD", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_TRINIDAD)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_ZIMBABWE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_ZIMBABWE)); + PyDict_SetItemString(d,"LANGUAGE_ESPERANTO", SWIG_PyObj_FromInt((int)wxLANGUAGE_ESPERANTO)); + PyDict_SetItemString(d,"LANGUAGE_ESTONIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ESTONIAN)); + PyDict_SetItemString(d,"LANGUAGE_FAEROESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_FAEROESE)); + PyDict_SetItemString(d,"LANGUAGE_FARSI", SWIG_PyObj_FromInt((int)wxLANGUAGE_FARSI)); + PyDict_SetItemString(d,"LANGUAGE_FIJI", SWIG_PyObj_FromInt((int)wxLANGUAGE_FIJI)); + PyDict_SetItemString(d,"LANGUAGE_FINNISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_FINNISH)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_BELGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_BELGIAN)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_CANADIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_CANADIAN)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_LUXEMBOURG", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_LUXEMBOURG)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_MONACO", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_MONACO)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_FRISIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRISIAN)); + PyDict_SetItemString(d,"LANGUAGE_GALICIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GALICIAN)); + PyDict_SetItemString(d,"LANGUAGE_GEORGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GEORGIAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_AUSTRIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_AUSTRIAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_BELGIUM", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_BELGIUM)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_LIECHTENSTEIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_LIECHTENSTEIN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_LUXEMBOURG", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_LUXEMBOURG)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_GREEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_GREEK)); + PyDict_SetItemString(d,"LANGUAGE_GREENLANDIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_GREENLANDIC)); + PyDict_SetItemString(d,"LANGUAGE_GUARANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_GUARANI)); + PyDict_SetItemString(d,"LANGUAGE_GUJARATI", SWIG_PyObj_FromInt((int)wxLANGUAGE_GUJARATI)); + PyDict_SetItemString(d,"LANGUAGE_HAUSA", SWIG_PyObj_FromInt((int)wxLANGUAGE_HAUSA)); + PyDict_SetItemString(d,"LANGUAGE_HEBREW", SWIG_PyObj_FromInt((int)wxLANGUAGE_HEBREW)); + PyDict_SetItemString(d,"LANGUAGE_HINDI", SWIG_PyObj_FromInt((int)wxLANGUAGE_HINDI)); + PyDict_SetItemString(d,"LANGUAGE_HUNGARIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_HUNGARIAN)); + PyDict_SetItemString(d,"LANGUAGE_ICELANDIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_ICELANDIC)); + PyDict_SetItemString(d,"LANGUAGE_INDONESIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_INDONESIAN)); + PyDict_SetItemString(d,"LANGUAGE_INTERLINGUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_INTERLINGUA)); + PyDict_SetItemString(d,"LANGUAGE_INTERLINGUE", SWIG_PyObj_FromInt((int)wxLANGUAGE_INTERLINGUE)); + PyDict_SetItemString(d,"LANGUAGE_INUKTITUT", SWIG_PyObj_FromInt((int)wxLANGUAGE_INUKTITUT)); + PyDict_SetItemString(d,"LANGUAGE_INUPIAK", SWIG_PyObj_FromInt((int)wxLANGUAGE_INUPIAK)); + PyDict_SetItemString(d,"LANGUAGE_IRISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_IRISH)); + PyDict_SetItemString(d,"LANGUAGE_ITALIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ITALIAN)); + PyDict_SetItemString(d,"LANGUAGE_ITALIAN_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_ITALIAN_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_JAPANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_JAPANESE)); + PyDict_SetItemString(d,"LANGUAGE_JAVANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_JAVANESE)); + PyDict_SetItemString(d,"LANGUAGE_KANNADA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KANNADA)); + PyDict_SetItemString(d,"LANGUAGE_KASHMIRI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KASHMIRI)); + PyDict_SetItemString(d,"LANGUAGE_KASHMIRI_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KASHMIRI_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_KAZAKH", SWIG_PyObj_FromInt((int)wxLANGUAGE_KAZAKH)); + PyDict_SetItemString(d,"LANGUAGE_KERNEWEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_KERNEWEK)); + PyDict_SetItemString(d,"LANGUAGE_KINYARWANDA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KINYARWANDA)); + PyDict_SetItemString(d,"LANGUAGE_KIRGHIZ", SWIG_PyObj_FromInt((int)wxLANGUAGE_KIRGHIZ)); + PyDict_SetItemString(d,"LANGUAGE_KIRUNDI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KIRUNDI)); + PyDict_SetItemString(d,"LANGUAGE_KONKANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KONKANI)); + PyDict_SetItemString(d,"LANGUAGE_KOREAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_KOREAN)); + PyDict_SetItemString(d,"LANGUAGE_KURDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_KURDISH)); + PyDict_SetItemString(d,"LANGUAGE_LAOTHIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LAOTHIAN)); + PyDict_SetItemString(d,"LANGUAGE_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_LATVIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LATVIAN)); + PyDict_SetItemString(d,"LANGUAGE_LINGALA", SWIG_PyObj_FromInt((int)wxLANGUAGE_LINGALA)); + PyDict_SetItemString(d,"LANGUAGE_LITHUANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LITHUANIAN)); + PyDict_SetItemString(d,"LANGUAGE_MACEDONIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MACEDONIAN)); + PyDict_SetItemString(d,"LANGUAGE_MALAGASY", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAGASY)); + PyDict_SetItemString(d,"LANGUAGE_MALAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY)); + PyDict_SetItemString(d,"LANGUAGE_MALAYALAM", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAYALAM)); + PyDict_SetItemString(d,"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM)); + PyDict_SetItemString(d,"LANGUAGE_MALAY_MALAYSIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY_MALAYSIA)); + PyDict_SetItemString(d,"LANGUAGE_MALTESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALTESE)); + PyDict_SetItemString(d,"LANGUAGE_MANIPURI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MANIPURI)); + PyDict_SetItemString(d,"LANGUAGE_MAORI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MAORI)); + PyDict_SetItemString(d,"LANGUAGE_MARATHI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MARATHI)); + PyDict_SetItemString(d,"LANGUAGE_MOLDAVIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MOLDAVIAN)); + PyDict_SetItemString(d,"LANGUAGE_MONGOLIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MONGOLIAN)); + PyDict_SetItemString(d,"LANGUAGE_NAURU", SWIG_PyObj_FromInt((int)wxLANGUAGE_NAURU)); + PyDict_SetItemString(d,"LANGUAGE_NEPALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_NEPALI)); + PyDict_SetItemString(d,"LANGUAGE_NEPALI_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_NEPALI_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_BOKMAL", SWIG_PyObj_FromInt((int)wxLANGUAGE_NORWEGIAN_BOKMAL)); + PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_NYNORSK", SWIG_PyObj_FromInt((int)wxLANGUAGE_NORWEGIAN_NYNORSK)); + PyDict_SetItemString(d,"LANGUAGE_OCCITAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_OCCITAN)); + PyDict_SetItemString(d,"LANGUAGE_ORIYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ORIYA)); + PyDict_SetItemString(d,"LANGUAGE_OROMO", SWIG_PyObj_FromInt((int)wxLANGUAGE_OROMO)); + PyDict_SetItemString(d,"LANGUAGE_PASHTO", SWIG_PyObj_FromInt((int)wxLANGUAGE_PASHTO)); + PyDict_SetItemString(d,"LANGUAGE_POLISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_POLISH)); + PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_PORTUGUESE)); + PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE_BRAZILIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_PORTUGUESE_BRAZILIAN)); + PyDict_SetItemString(d,"LANGUAGE_PUNJABI", SWIG_PyObj_FromInt((int)wxLANGUAGE_PUNJABI)); + PyDict_SetItemString(d,"LANGUAGE_QUECHUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_QUECHUA)); + PyDict_SetItemString(d,"LANGUAGE_RHAETO_ROMANCE", SWIG_PyObj_FromInt((int)wxLANGUAGE_RHAETO_ROMANCE)); + PyDict_SetItemString(d,"LANGUAGE_ROMANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ROMANIAN)); + PyDict_SetItemString(d,"LANGUAGE_RUSSIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_RUSSIAN)); + PyDict_SetItemString(d,"LANGUAGE_RUSSIAN_UKRAINE", SWIG_PyObj_FromInt((int)wxLANGUAGE_RUSSIAN_UKRAINE)); + PyDict_SetItemString(d,"LANGUAGE_SAMOAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SAMOAN)); + PyDict_SetItemString(d,"LANGUAGE_SANGHO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SANGHO)); + PyDict_SetItemString(d,"LANGUAGE_SANSKRIT", SWIG_PyObj_FromInt((int)wxLANGUAGE_SANSKRIT)); + PyDict_SetItemString(d,"LANGUAGE_SCOTS_GAELIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SCOTS_GAELIC)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_SERBO_CROATIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBO_CROATIAN)); + PyDict_SetItemString(d,"LANGUAGE_SESOTHO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SESOTHO)); + PyDict_SetItemString(d,"LANGUAGE_SETSWANA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SETSWANA)); + PyDict_SetItemString(d,"LANGUAGE_SHONA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SHONA)); + PyDict_SetItemString(d,"LANGUAGE_SINDHI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SINDHI)); + PyDict_SetItemString(d,"LANGUAGE_SINHALESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SINHALESE)); + PyDict_SetItemString(d,"LANGUAGE_SISWATI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SISWATI)); + PyDict_SetItemString(d,"LANGUAGE_SLOVAK", SWIG_PyObj_FromInt((int)wxLANGUAGE_SLOVAK)); + PyDict_SetItemString(d,"LANGUAGE_SLOVENIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SLOVENIAN)); + PyDict_SetItemString(d,"LANGUAGE_SOMALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SOMALI)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_ARGENTINA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_ARGENTINA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_BOLIVIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_BOLIVIA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_CHILE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_CHILE)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_COLOMBIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_COLOMBIA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_COSTA_RICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_COSTA_RICA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_ECUADOR", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_ECUADOR)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_EL_SALVADOR", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_EL_SALVADOR)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_GUATEMALA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_GUATEMALA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_HONDURAS", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_HONDURAS)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_MEXICAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_MEXICAN)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_MODERN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_MODERN)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_NICARAGUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_NICARAGUA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PANAMA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PANAMA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PARAGUAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PARAGUAY)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PERU", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PERU)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PUERTO_RICO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PUERTO_RICO)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_URUGUAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_URUGUAY)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_US", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_US)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_VENEZUELA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_VENEZUELA)); + PyDict_SetItemString(d,"LANGUAGE_SUNDANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SUNDANESE)); + PyDict_SetItemString(d,"LANGUAGE_SWAHILI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWAHILI)); + PyDict_SetItemString(d,"LANGUAGE_SWEDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWEDISH)); + PyDict_SetItemString(d,"LANGUAGE_SWEDISH_FINLAND", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWEDISH_FINLAND)); + PyDict_SetItemString(d,"LANGUAGE_TAGALOG", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAGALOG)); + PyDict_SetItemString(d,"LANGUAGE_TAJIK", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAJIK)); + PyDict_SetItemString(d,"LANGUAGE_TAMIL", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAMIL)); + PyDict_SetItemString(d,"LANGUAGE_TATAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_TATAR)); + PyDict_SetItemString(d,"LANGUAGE_TELUGU", SWIG_PyObj_FromInt((int)wxLANGUAGE_TELUGU)); + PyDict_SetItemString(d,"LANGUAGE_THAI", SWIG_PyObj_FromInt((int)wxLANGUAGE_THAI)); + PyDict_SetItemString(d,"LANGUAGE_TIBETAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_TIBETAN)); + PyDict_SetItemString(d,"LANGUAGE_TIGRINYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TIGRINYA)); + PyDict_SetItemString(d,"LANGUAGE_TONGA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TONGA)); + PyDict_SetItemString(d,"LANGUAGE_TSONGA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TSONGA)); + PyDict_SetItemString(d,"LANGUAGE_TURKISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_TURKISH)); + PyDict_SetItemString(d,"LANGUAGE_TURKMEN", SWIG_PyObj_FromInt((int)wxLANGUAGE_TURKMEN)); + PyDict_SetItemString(d,"LANGUAGE_TWI", SWIG_PyObj_FromInt((int)wxLANGUAGE_TWI)); + PyDict_SetItemString(d,"LANGUAGE_UIGHUR", SWIG_PyObj_FromInt((int)wxLANGUAGE_UIGHUR)); + PyDict_SetItemString(d,"LANGUAGE_UKRAINIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UKRAINIAN)); + PyDict_SetItemString(d,"LANGUAGE_URDU", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU)); + PyDict_SetItemString(d,"LANGUAGE_URDU_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_URDU_PAKISTAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU_PAKISTAN)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_VIETNAMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_VIETNAMESE)); + PyDict_SetItemString(d,"LANGUAGE_VOLAPUK", SWIG_PyObj_FromInt((int)wxLANGUAGE_VOLAPUK)); + PyDict_SetItemString(d,"LANGUAGE_WELSH", SWIG_PyObj_FromInt((int)wxLANGUAGE_WELSH)); + PyDict_SetItemString(d,"LANGUAGE_WOLOF", SWIG_PyObj_FromInt((int)wxLANGUAGE_WOLOF)); + PyDict_SetItemString(d,"LANGUAGE_XHOSA", SWIG_PyObj_FromInt((int)wxLANGUAGE_XHOSA)); + PyDict_SetItemString(d,"LANGUAGE_YIDDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_YIDDISH)); + PyDict_SetItemString(d,"LANGUAGE_YORUBA", SWIG_PyObj_FromInt((int)wxLANGUAGE_YORUBA)); + PyDict_SetItemString(d,"LANGUAGE_ZHUANG", SWIG_PyObj_FromInt((int)wxLANGUAGE_ZHUANG)); + PyDict_SetItemString(d,"LANGUAGE_ZULU", SWIG_PyObj_FromInt((int)wxLANGUAGE_ZULU)); + PyDict_SetItemString(d,"LANGUAGE_USER_DEFINED", SWIG_PyObj_FromInt((int)wxLANGUAGE_USER_DEFINED)); + PyDict_SetItemString(d,"LOCALE_CAT_NUMBER", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_NUMBER)); + PyDict_SetItemString(d,"LOCALE_CAT_DATE", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_DATE)); + PyDict_SetItemString(d,"LOCALE_CAT_MONEY", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_MONEY)); + PyDict_SetItemString(d,"LOCALE_CAT_MAX", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_MAX)); + PyDict_SetItemString(d,"LOCALE_THOUSANDS_SEP", SWIG_PyObj_FromInt((int)wxLOCALE_THOUSANDS_SEP)); + PyDict_SetItemString(d,"LOCALE_DECIMAL_POINT", SWIG_PyObj_FromInt((int)wxLOCALE_DECIMAL_POINT)); + PyDict_SetItemString(d,"LOCALE_LOAD_DEFAULT", SWIG_PyObj_FromInt((int)wxLOCALE_LOAD_DEFAULT)); + PyDict_SetItemString(d,"LOCALE_CONV_ENCODING", SWIG_PyObj_FromInt((int)wxLOCALE_CONV_ENCODING)); + PyDict_SetItemString(d,"CONVERT_STRICT", SWIG_PyObj_FromInt((int)wxCONVERT_STRICT)); + PyDict_SetItemString(d,"CONVERT_SUBSTITUTE", SWIG_PyObj_FromInt((int)wxCONVERT_SUBSTITUTE)); + PyDict_SetItemString(d,"PLATFORM_CURRENT", SWIG_PyObj_FromInt((int)wxPLATFORM_CURRENT)); + PyDict_SetItemString(d,"PLATFORM_UNIX", SWIG_PyObj_FromInt((int)wxPLATFORM_UNIX)); + PyDict_SetItemString(d,"PLATFORM_WINDOWS", SWIG_PyObj_FromInt((int)wxPLATFORM_WINDOWS)); + PyDict_SetItemString(d,"PLATFORM_OS2", SWIG_PyObj_FromInt((int)wxPLATFORM_OS2)); + PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_PyObj_FromInt((int)wxPLATFORM_MAC)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_NORMAL)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_TRANSPARENT", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_TRANSPARENT)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_SELECTED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_SELECTED)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_FOCUSED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_FOCUSED)); + PyDict_SetItemString(d,"IMAGE_LIST_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_NORMAL)); + PyDict_SetItemString(d,"IMAGE_LIST_SMALL", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_SMALL)); + PyDict_SetItemString(d,"IMAGE_LIST_STATE", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_STATE)); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"NORMAL_FONT",_wrap_NORMAL_FONT_get, _wrap_NORMAL_FONT_set); SWIG_addvarlink(SWIG_globals,(char*)"SMALL_FONT",_wrap_SMALL_FONT_get, _wrap_SMALL_FONT_set); diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index 380473381e..5333a2707c 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -395,44 +244,45 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxDC swig_types[11] #define SWIGTYPE_p_wxGridTableMessage swig_types[12] #define SWIGTYPE_p_wxGrid swig_types[13] -#define SWIGTYPE_p_wxPanel swig_types[14] -#define SWIGTYPE_p_wxNotifyEvent swig_types[15] -#define SWIGTYPE_p_wxGridRangeSelectEvent swig_types[16] -#define SWIGTYPE_p_wxSize swig_types[17] -#define SWIGTYPE_p_wxGridCellCoords swig_types[18] -#define SWIGTYPE_p_wxScrolledWindow swig_types[19] -#define SWIGTYPE_p_wxWindow swig_types[20] -#define SWIGTYPE_p_wxFont swig_types[21] -#define SWIGTYPE_p_wxControl swig_types[22] -#define SWIGTYPE_p_wxEvent swig_types[23] -#define SWIGTYPE_p_wxObject swig_types[24] -#define SWIGTYPE_p_wxGridSizeEvent swig_types[25] -#define SWIGTYPE_p_wxRect swig_types[26] -#define SWIGTYPE_p_long swig_types[27] -#define SWIGTYPE_p_wxString swig_types[28] -#define SWIGTYPE_p_wxEvtHandler swig_types[29] -#define SWIGTYPE_p_wxPoint swig_types[30] -#define SWIGTYPE_p_wxGridEvent swig_types[31] -#define SWIGTYPE_p_wxGridEditorCreatedEvent swig_types[32] -#define SWIGTYPE_p_wxGridTableBase swig_types[33] -#define SWIGTYPE_p_wxGridCellFloatEditor swig_types[34] +#define SWIGTYPE_p_char swig_types[14] +#define SWIGTYPE_p_wxPanel swig_types[15] +#define SWIGTYPE_p_wxNotifyEvent swig_types[16] +#define SWIGTYPE_p_wxGridRangeSelectEvent swig_types[17] +#define SWIGTYPE_p_wxSize swig_types[18] +#define SWIGTYPE_p_wxGridCellCoords swig_types[19] +#define SWIGTYPE_p_wxScrolledWindow swig_types[20] +#define SWIGTYPE_p_wxWindow swig_types[21] +#define SWIGTYPE_p_wxFont swig_types[22] +#define SWIGTYPE_p_wxControl swig_types[23] +#define SWIGTYPE_p_wxEvent swig_types[24] +#define SWIGTYPE_p_wxObject swig_types[25] +#define SWIGTYPE_p_wxGridSizeEvent swig_types[26] +#define SWIGTYPE_p_wxRect swig_types[27] +#define SWIGTYPE_p_long swig_types[28] +#define SWIGTYPE_p_wxString swig_types[29] +#define SWIGTYPE_p_wxEvtHandler swig_types[30] +#define SWIGTYPE_p_wxPoint swig_types[31] +#define SWIGTYPE_p_wxGridEvent swig_types[32] +#define SWIGTYPE_p_wxGridEditorCreatedEvent swig_types[33] +#define SWIGTYPE_p_wxGridTableBase swig_types[34] #define SWIGTYPE_p_wxGridCellNumberEditor swig_types[35] #define SWIGTYPE_p_wxPyGridCellEditor swig_types[36] #define SWIGTYPE_p_wxGridCellEditor swig_types[37] #define SWIGTYPE_p_wxGridCellTextEditor swig_types[38] -#define SWIGTYPE_p_wxGridCellBoolEditor swig_types[39] -#define SWIGTYPE_p_wxPyGridTableBase swig_types[40] -#define SWIGTYPE_p_wxGridStringTable swig_types[41] -#define SWIGTYPE_p_wxArrayString swig_types[42] -#define SWIGTYPE_p_wxCommandEvent swig_types[43] -#define SWIGTYPE_p_wxGridCellAttrProvider swig_types[44] -#define SWIGTYPE_p_wxKeyEvent swig_types[45] -#define SWIGTYPE_p_wxGridCellChoiceEditor swig_types[46] -#define SWIGTYPE_p_wxGridCellEnumEditor swig_types[47] -#define SWIGTYPE_p_wxGridCellAutoWrapStringEditor swig_types[48] -#define SWIGTYPE_p_int swig_types[49] -#define SWIGTYPE_p_wxPyGridCellAttrProvider swig_types[50] -static swig_type_info *swig_types[52]; +#define SWIGTYPE_p_wxGridCellFloatEditor swig_types[39] +#define SWIGTYPE_p_wxGridCellBoolEditor swig_types[40] +#define SWIGTYPE_p_wxPyGridTableBase swig_types[41] +#define SWIGTYPE_p_wxGridStringTable swig_types[42] +#define SWIGTYPE_p_wxArrayString swig_types[43] +#define SWIGTYPE_p_wxCommandEvent swig_types[44] +#define SWIGTYPE_p_wxGridCellAttrProvider swig_types[45] +#define SWIGTYPE_p_wxKeyEvent swig_types[46] +#define SWIGTYPE_p_wxGridCellChoiceEditor swig_types[47] +#define SWIGTYPE_p_wxGridCellEnumEditor swig_types[48] +#define SWIGTYPE_p_wxGridCellAutoWrapStringEditor swig_types[49] +#define SWIGTYPE_p_int swig_types[50] +#define SWIGTYPE_p_wxPyGridCellAttrProvider swig_types[51] +static swig_type_info *swig_types[53]; /* -------- TYPES TABLE (END) -------- */ @@ -444,6 +294,44 @@ static swig_type_info *swig_types[52]; #define SWIG_name "_grid" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/printfw.h" @@ -897,6 +785,21 @@ void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + class wxPyGridCellRenderer : public wxGridCellRenderer { public: @@ -996,6 +899,15 @@ void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + class wxPyGridCellEditor : public wxGridCellEditor { public: @@ -1171,6 +1083,29 @@ void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + + class wxPyGridTableBase : public wxGridTableBase { public: @@ -1376,7 +1311,7 @@ wxGridCellCoords wxGrid_XYToCell(wxGrid *self,int x,int y){ #ifdef __cplusplus extern "C" { #endif -static int _wrap_DateTimeFormatStr_set(PyObject *_val) { +static int _wrap_DateTimeFormatStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DateTimeFormatStr is read-only."); return 1; } @@ -1396,7 +1331,7 @@ static PyObject *_wrap_DateTimeFormatStr_get() { } -static int _wrap_GridNoCellCoords_set(PyObject *_val) { +static int _wrap_GridNoCellCoords_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GridNoCellCoords is read-only."); return 1; } @@ -1410,7 +1345,7 @@ static PyObject *_wrap_GridNoCellCoords_get() { } -static int _wrap_GridNoCellRect_set(PyObject *_val) { +static int _wrap_GridNoCellRect_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GridNoCellRect is read-only."); return 1; } @@ -1555,12 +1490,14 @@ static PyObject *_wrap_GridCellRenderer_Draw(PyObject *self, PyObject *args, PyO PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "grid",(char *) "attr",(char *) "dc",(char *) "rect",(char *) "row",(char *) "col",(char *) "isSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOiiO:GridCellRenderer_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:GridCellRenderer_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -1579,7 +1516,15 @@ static PyObject *_wrap_GridCellRenderer_Draw(PyObject *self, PyObject *args, PyO if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail; } { - arg8 = (bool) SPyObj_AsBool(obj7); + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } { @@ -1609,11 +1554,13 @@ static PyObject *_wrap_GridCellRenderer_GetBestSize(PyObject *self, PyObject *ar PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "grid",(char *) "attr",(char *) "dc",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOii:GridCellRenderer_GetBestSize",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:GridCellRenderer_GetBestSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -1627,6 +1574,14 @@ static PyObject *_wrap_GridCellRenderer_GetBestSize(PyObject *self, PyObject *ar if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBestSize(*arg2,*arg3,*arg4,arg5,arg6); @@ -1841,11 +1796,25 @@ static PyObject *_wrap_new_GridCellFloatRenderer(PyObject *self, PyObject *args, int arg1 = (int) -1 ; int arg2 = (int) -1 ; wxGridCellFloatRenderer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "width",(char *) "precision", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridCellFloatRenderer",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellFloatRenderer",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellFloatRenderer *)new wxGridCellFloatRenderer(arg1,arg2); @@ -1878,7 +1847,7 @@ static PyObject *_wrap_GridCellFloatRenderer_GetWidth(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1890,12 +1859,17 @@ static PyObject *_wrap_GridCellFloatRenderer_SetWidth(PyObject *self, PyObject * wxGridCellFloatRenderer *arg1 = (wxGridCellFloatRenderer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellFloatRenderer_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellFloatRenderer_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellFloatRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -1928,7 +1902,7 @@ static PyObject *_wrap_GridCellFloatRenderer_GetPrecision(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1940,12 +1914,17 @@ static PyObject *_wrap_GridCellFloatRenderer_SetPrecision(PyObject *self, PyObje wxGridCellFloatRenderer *arg1 = (wxGridCellFloatRenderer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "precision", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellFloatRenderer_SetPrecision",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellFloatRenderer_SetPrecision",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellFloatRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrecision(arg2); @@ -2167,7 +2146,7 @@ static PyObject *_wrap_GridCellEditor_IsCreated(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2378,14 +2357,19 @@ static PyObject *_wrap_GridCellEditor_Create(PyObject *self, PyObject *args, PyO wxEvtHandler *arg4 = (wxEvtHandler *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "evtHandler", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO:GridCellEditor_Create",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellEditor_Create",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2408,13 +2392,23 @@ static PyObject *_wrap_GridCellEditor_BeginEdit(PyObject *self, PyObject *args, int arg3 ; wxGrid *arg4 = (wxGrid *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "grid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridCellEditor_BeginEdit",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellEditor_BeginEdit",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2438,13 +2432,23 @@ static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, Py wxGrid *arg4 = (wxGrid *) 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "grid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridCellEditor_EndEdit",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellEditor_EndEdit",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2453,7 +2457,7 @@ static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2557,7 +2561,7 @@ static PyObject *_wrap_GridCellEditor_Show(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:GridCellEditor_Show",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { @@ -2635,7 +2639,7 @@ static PyObject *_wrap_GridCellEditor_IsAcceptedKey(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2855,7 +2859,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyGridCellEditor_base_Show",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { @@ -2933,7 +2937,7 @@ static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3160,11 +3164,25 @@ static PyObject *_wrap_new_GridCellNumberEditor(PyObject *self, PyObject *args, int arg1 = (int) -1 ; int arg2 = (int) -1 ; wxGridCellNumberEditor *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "min",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridCellNumberEditor",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellNumberEditor",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellNumberEditor *)new wxGridCellNumberEditor(arg1,arg2); @@ -3359,7 +3377,7 @@ static PyObject *_wrap_new_GridCellChoiceEditor(PyObject *self, PyObject *args, } if (obj1) { { - arg3 = (bool) SPyObj_AsBool(obj1); + arg3 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -3816,12 +3834,22 @@ static PyObject *_wrap_GridCellAttr_SetAlignment(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hAlign",(char *) "vAlign", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridCellAttr_SetAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttr_SetAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment(arg2,arg3); @@ -3842,12 +3870,22 @@ static PyObject *_wrap_GridCellAttr_SetSize(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "num_rows",(char *) "num_cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridCellAttr_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttr_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -3876,7 +3914,7 @@ static PyObject *_wrap_GridCellAttr_SetOverflow(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -3908,7 +3946,7 @@ static PyObject *_wrap_GridCellAttr_SetReadOnly(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -3985,12 +4023,17 @@ static PyObject *_wrap_GridCellAttr_SetKind(PyObject *self, PyObject *args, PyOb wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellAttr_SetKind",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellAttr_SetKind",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetKind((wxGridCellAttr::wxAttrKind )arg2); @@ -4023,7 +4066,7 @@ static PyObject *_wrap_GridCellAttr_HasTextColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4048,7 +4091,7 @@ static PyObject *_wrap_GridCellAttr_HasBackgroundColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4073,7 +4116,7 @@ static PyObject *_wrap_GridCellAttr_HasFont(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4098,7 +4141,7 @@ static PyObject *_wrap_GridCellAttr_HasAlignment(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4123,7 +4166,7 @@ static PyObject *_wrap_GridCellAttr_HasRenderer(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4148,7 +4191,7 @@ static PyObject *_wrap_GridCellAttr_HasEditor(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4173,7 +4216,7 @@ static PyObject *_wrap_GridCellAttr_HasReadWriteMode(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4198,7 +4241,7 @@ static PyObject *_wrap_GridCellAttr_HasOverflowMode(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4386,7 +4429,7 @@ static PyObject *_wrap_GridCellAttr_GetOverflow(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4402,13 +4445,23 @@ static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *self, PyObject *args, wxGridCellRenderer *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "grid",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:GridCellAttr_GetRenderer",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttr_GetRenderer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellRenderer *)((wxGridCellAttr const *)arg1)->GetRenderer(arg2,arg3,arg4); @@ -4434,13 +4487,23 @@ static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *self, PyObject *args, Py wxGridCellEditor *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "grid",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:GridCellAttr_GetEditor",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttr_GetEditor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellEditor *)((wxGridCellAttr const *)arg1)->GetEditor(arg2,arg3,arg4); @@ -4475,7 +4538,7 @@ static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4575,12 +4638,27 @@ static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *self, PyObject *ar int arg4 ; wxGridCellAttr *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:GridCellAttrProvider_GetAttr",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttrProvider_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellAttr *)((wxGridCellAttrProvider const *)arg1)->GetAttr(arg2,arg3,(wxGridCellAttr::wxAttrKind )arg4); @@ -4605,13 +4683,23 @@ static PyObject *_wrap_GridCellAttrProvider_SetAttr(PyObject *self, PyObject *ar int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:GridCellAttrProvider_SetAttr",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttrProvider_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttr(arg2,arg3,arg4); @@ -4633,13 +4721,18 @@ static PyObject *_wrap_GridCellAttrProvider_SetRowAttr(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridCellAttrProvider_SetRowAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowAttr(arg2,arg3); @@ -4661,13 +4754,18 @@ static PyObject *_wrap_GridCellAttrProvider_SetColAttr(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridCellAttrProvider_SetColAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColAttr(arg2,arg3); @@ -4689,14 +4787,19 @@ static PyObject *_wrap_GridCellAttrProvider_UpdateAttrRows(PyObject *self, PyObj int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridCellAttrProvider_UpdateAttrRows",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_UpdateAttrRows",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4720,14 +4823,19 @@ static PyObject *_wrap_GridCellAttrProvider_UpdateAttrCols(PyObject *self, PyObj int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridCellAttrProvider_UpdateAttrCols",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_UpdateAttrCols",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4811,12 +4919,27 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *self, PyObj int arg4 ; wxGridCellAttr *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:PyGridCellAttrProvider_base_GetAttr",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_base_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellAttr *)(arg1)->base_GetAttr(arg2,arg3,(wxGridCellAttr::wxAttrKind )arg4); @@ -4841,13 +4964,23 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *self, PyObj int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:PyGridCellAttrProvider_base_SetAttr",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_base_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetAttr(arg2,arg3,arg4); @@ -4869,13 +5002,18 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *self, Py int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyGridCellAttrProvider_base_SetRowAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellAttrProvider_base_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetRowAttr(arg2,arg3); @@ -4897,13 +5035,18 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *self, Py int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyGridCellAttrProvider_base_SetColAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellAttrProvider_base_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetColAttr(arg2,arg3); @@ -5078,7 +5221,7 @@ static PyObject *_wrap_GridTableBase_GetNumberRows(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5103,7 +5246,7 @@ static PyObject *_wrap_GridTableBase_GetNumberCols(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5117,12 +5260,22 @@ static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args, int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_IsEmptyCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_IsEmptyCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsEmptyCell(arg2,arg3); @@ -5130,7 +5283,7 @@ static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5144,12 +5297,22 @@ static PyObject *_wrap_GridTableBase_GetValue(PyObject *self, PyObject *args, Py int arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetValue",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetValue(arg2,arg3); @@ -5178,13 +5341,23 @@ static PyObject *_wrap_GridTableBase_SetValue(PyObject *self, PyObject *args, Py wxString *arg4 = 0 ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridTableBase_SetValue",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValue",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -5219,12 +5392,22 @@ static PyObject *_wrap_GridTableBase_GetTypeName(PyObject *self, PyObject *args, int arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetTypeName",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetTypeName",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetTypeName(arg2,arg3); @@ -5254,13 +5437,23 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg bool result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridTableBase_CanGetValueAs",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_CanGetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -5273,7 +5466,7 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -5297,13 +5490,23 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg bool result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridTableBase_CanSetValueAs",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_CanSetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -5316,7 +5519,7 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -5338,12 +5541,22 @@ static PyObject *_wrap_GridTableBase_GetValueAsLong(PyObject *self, PyObject *ar int arg3 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetValueAsLong",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsLong",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->GetValueAsLong(arg2,arg3); @@ -5351,7 +5564,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsLong(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -5365,12 +5578,22 @@ static PyObject *_wrap_GridTableBase_GetValueAsDouble(PyObject *self, PyObject * int arg3 ; double result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetValueAsDouble",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsDouble",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetValueAsDouble(arg2,arg3); @@ -5378,7 +5601,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsDouble(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -5392,12 +5615,22 @@ static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *ar int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetValueAsBool",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsBool",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetValueAsBool(arg2,arg3); @@ -5405,7 +5638,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5419,12 +5652,27 @@ static PyObject *_wrap_GridTableBase_SetValueAsLong(PyObject *self, PyObject *ar int arg3 ; long arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiil:GridTableBase_SetValueAsLong",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsLong",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValueAsLong(arg2,arg3,arg4); @@ -5446,12 +5694,27 @@ static PyObject *_wrap_GridTableBase_SetValueAsDouble(PyObject *self, PyObject * int arg3 ; double arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiid:GridTableBase_SetValueAsDouble",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsDouble",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValueAsDouble(arg2,arg3,arg4); @@ -5473,15 +5736,25 @@ static PyObject *_wrap_GridTableBase_SetValueAsBool(PyObject *self, PyObject *ar int arg3 ; bool arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridTableBase_SetValueAsBool",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsBool",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = (bool) SPyObj_AsBool(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -5539,13 +5812,13 @@ static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5556,7 +5829,7 @@ static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5578,7 +5851,7 @@ static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -5589,7 +5862,7 @@ static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5613,13 +5886,13 @@ static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5630,7 +5903,7 @@ static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5654,13 +5927,13 @@ static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5671,7 +5944,7 @@ static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5693,7 +5966,7 @@ static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -5704,7 +5977,7 @@ static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5728,13 +6001,13 @@ static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5745,7 +6018,7 @@ static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5758,12 +6031,17 @@ static PyObject *_wrap_GridTableBase_GetRowLabelValue(PyObject *self, PyObject * int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableBase_GetRowLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableBase_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetRowLabelValue(arg2); @@ -5790,12 +6068,17 @@ static PyObject *_wrap_GridTableBase_GetColLabelValue(PyObject *self, PyObject * int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableBase_GetColLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableBase_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetColLabelValue(arg2); @@ -5823,13 +6106,18 @@ static PyObject *_wrap_GridTableBase_SetRowLabelValue(PyObject *self, PyObject * wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:GridTableBase_SetRowLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -5864,13 +6152,18 @@ static PyObject *_wrap_GridTableBase_SetColLabelValue(PyObject *self, PyObject * wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:GridTableBase_SetColLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -5916,7 +6209,7 @@ static PyObject *_wrap_GridTableBase_CanHaveAttributes(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5931,12 +6224,27 @@ static PyObject *_wrap_GridTableBase_GetAttr(PyObject *self, PyObject *args, PyO int arg4 ; wxGridCellAttr *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:GridTableBase_GetAttr",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellAttr *)(arg1)->GetAttr(arg2,arg3,(wxGridCellAttr::wxAttrKind )arg4); @@ -5961,13 +6269,23 @@ static PyObject *_wrap_GridTableBase_SetAttr(PyObject *self, PyObject *args, PyO int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:GridTableBase_SetAttr",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttr(arg2,arg3,arg4); @@ -5989,13 +6307,18 @@ static PyObject *_wrap_GridTableBase_SetRowAttr(PyObject *self, PyObject *args, int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridTableBase_SetRowAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowAttr(arg2,arg3); @@ -6017,13 +6340,18 @@ static PyObject *_wrap_GridTableBase_SetColAttr(PyObject *self, PyObject *args, int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridTableBase_SetColAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColAttr(arg2,arg3); @@ -6128,12 +6456,22 @@ static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *self, PyObject int arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyGridTableBase_base_GetTypeName",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_GetTypeName",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->base_GetTypeName(arg2,arg3); @@ -6163,13 +6501,23 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje bool result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:PyGridTableBase_base_CanGetValueAs",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_CanGetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -6182,7 +6530,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -6206,13 +6554,23 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje bool result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:PyGridTableBase_base_CanSetValueAs",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_CanSetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -6225,7 +6583,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -6281,13 +6639,13 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6298,7 +6656,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6320,7 +6678,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -6331,7 +6689,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6355,13 +6713,13 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6372,7 +6730,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6396,13 +6754,13 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6413,7 +6771,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6435,7 +6793,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -6446,7 +6804,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6470,13 +6828,13 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6487,7 +6845,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6500,12 +6858,17 @@ static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *self, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyGridTableBase_base_GetRowLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_base_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->base_GetRowLabelValue(arg2); @@ -6532,12 +6895,17 @@ static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *self, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyGridTableBase_base_GetColLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_base_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->base_GetColLabelValue(arg2); @@ -6565,13 +6933,18 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *self, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyGridTableBase_base_SetRowLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -6606,13 +6979,18 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *self, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyGridTableBase_base_SetColLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -6658,7 +7036,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6673,12 +7051,27 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *self, PyObject *ar int arg4 ; wxGridCellAttr *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:PyGridTableBase_base_GetAttr",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellAttr *)(arg1)->base_GetAttr(arg2,arg3,(wxGridCellAttr::wxAttrKind )arg4); @@ -6703,13 +7096,23 @@ static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *self, PyObject *ar int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:PyGridTableBase_base_SetAttr",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetAttr(arg2,arg3,arg4); @@ -6731,13 +7134,18 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyGridTableBase_base_SetRowAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetRowAttr(arg2,arg3); @@ -6759,13 +7167,18 @@ static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyGridTableBase_base_SetColAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetColAttr(arg2,arg3); @@ -6792,11 +7205,25 @@ static PyObject *_wrap_new_GridStringTable(PyObject *self, PyObject *args, PyObj int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxGridStringTable *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "numRows",(char *) "numCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridStringTable",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridStringTable",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridStringTable *)new wxGridStringTable(arg1,arg2); @@ -6826,12 +7253,31 @@ static PyObject *_wrap_new_GridTableMessage(PyObject *self, PyObject *args, PyOb int arg4 = (int) -1 ; wxGridTableMessage *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "table",(char *) "id",(char *) "comInt1",(char *) "comInt2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_GridTableMessage",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_GridTableMessage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridTableMessage *)new wxGridTableMessage(arg1,arg2,arg3,arg4); @@ -6929,12 +7375,17 @@ static PyObject *_wrap_GridTableMessage_SetId(PyObject *self, PyObject *args, Py wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableMessage_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableMessage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -6967,7 +7418,7 @@ static PyObject *_wrap_GridTableMessage_GetId(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6979,12 +7430,17 @@ static PyObject *_wrap_GridTableMessage_SetCommandInt(PyObject *self, PyObject * wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "comInt1", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableMessage_SetCommandInt",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetCommandInt",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableMessage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCommandInt(arg2); @@ -7017,7 +7473,7 @@ static PyObject *_wrap_GridTableMessage_GetCommandInt(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7029,12 +7485,17 @@ static PyObject *_wrap_GridTableMessage_SetCommandInt2(PyObject *self, PyObject wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "comInt2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableMessage_SetCommandInt2",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetCommandInt2",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableMessage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCommandInt2(arg2); @@ -7067,7 +7528,7 @@ static PyObject *_wrap_GridTableMessage_GetCommandInt2(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7086,11 +7547,25 @@ static PyObject *_wrap_new_GridCellCoords(PyObject *self, PyObject *args, PyObje int arg1 = (int) -1 ; int arg2 = (int) -1 ; wxGridCellCoords *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "r",(char *) "c", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridCellCoords",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellCoords",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellCoords *)new wxGridCellCoords(arg1,arg2); @@ -7147,7 +7622,7 @@ static PyObject *_wrap_GridCellCoords_GetRow(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7159,12 +7634,17 @@ static PyObject *_wrap_GridCellCoords_SetRow(PyObject *self, PyObject *args, PyO wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellCoords_SetRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords_SetRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRow(arg2); @@ -7197,7 +7677,7 @@ static PyObject *_wrap_GridCellCoords_GetCol(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7209,12 +7689,17 @@ static PyObject *_wrap_GridCellCoords_SetCol(PyObject *self, PyObject *args, PyO wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellCoords_SetCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords_SetCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCol(arg2); @@ -7235,12 +7720,22 @@ static PyObject *_wrap_GridCellCoords_Set(PyObject *self, PyObject *args, PyObje int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridCellCoords_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellCoords_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set(arg2,arg3); @@ -7279,7 +7774,7 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7310,7 +7805,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7365,15 +7860,21 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs 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 *)"Oi|OOlO:new_Grid",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Grid",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -7386,6 +7887,12 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -7425,12 +7932,29 @@ static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject WXGRIDSELECTIONMODES arg4 = (WXGRIDSELECTIONMODES) wxGrid::wxGridSelectCells ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numRows",(char *) "numCols",(char *) "selmode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:Grid_CreateGrid",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_CreateGrid",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (WXGRIDSELECTIONMODES) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->CreateGrid(arg2,arg3,arg4); @@ -7438,7 +7962,7 @@ static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7450,12 +7974,17 @@ static PyObject *_wrap_Grid_SetSelectionMode(PyObject *self, PyObject *args, PyO wxGrid *arg1 = (wxGrid *) 0 ; WXGRIDSELECTIONMODES arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "selmode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetSelectionMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetSelectionMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (WXGRIDSELECTIONMODES) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelectionMode(arg2); @@ -7488,7 +8017,7 @@ static PyObject *_wrap_Grid_GetSelectionMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7513,7 +8042,7 @@ static PyObject *_wrap_Grid_GetNumberRows(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7538,7 +8067,7 @@ static PyObject *_wrap_Grid_GetNumberCols(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7569,7 +8098,7 @@ static PyObject *_wrap_Grid_ProcessTableMessage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7613,16 +8142,23 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "table",(char *) "takeOwnership",(char *) "selmode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|Oi:Grid_SetTable",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Grid_SetTable",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (WXGRIDSELECTIONMODES) SWIG_PyObj_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7633,7 +8169,7 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7672,16 +8208,30 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numRows",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiO:Grid_InsertRows",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Grid_InsertRows",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7692,7 +8242,7 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7706,16 +8256,23 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject bool arg3 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numRows",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Grid_AppendRows",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Grid_AppendRows",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7726,7 +8283,7 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7741,16 +8298,30 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numRows",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiO:Grid_DeleteRows",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Grid_DeleteRows",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7761,7 +8332,7 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7776,16 +8347,30 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numCols",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiO:Grid_InsertCols",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Grid_InsertCols",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7796,7 +8381,7 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7810,16 +8395,23 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject bool arg3 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numCols",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Grid_AppendCols",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Grid_AppendCols",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7830,7 +8422,7 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7845,16 +8437,30 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numCols",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiO:Grid_DeleteCols",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Grid_DeleteCols",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7865,7 +8471,7 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7920,11 +8526,14 @@ static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, Py PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc","arg3","arg4",(char *) "horizontalAlignment",(char *) "verticalAlignment",(char *) "textOrientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iii:Grid_DrawTextRectangle",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:Grid_DrawTextRectangle",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -7939,6 +8548,24 @@ static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, Py arg4 = &temp4; if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawTextRectangle(*arg2,(wxString const &)*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); @@ -8098,7 +8725,7 @@ static PyObject *_wrap_Grid_GetBatchCount(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8145,7 +8772,7 @@ static PyObject *_wrap_Grid_Refresh(PyObject *self, PyObject *args, PyObject *kw if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -8184,7 +8811,7 @@ static PyObject *_wrap_Grid_IsEditable(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8204,7 +8831,7 @@ static PyObject *_wrap_Grid_EnableEditing(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_EnableEditing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8235,7 +8862,7 @@ static PyObject *_wrap_Grid_EnableCellEditControl(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -8295,7 +8922,7 @@ static PyObject *_wrap_Grid_CanEnableCellControl(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8320,7 +8947,7 @@ static PyObject *_wrap_Grid_IsCellEditControlEnabled(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8345,7 +8972,7 @@ static PyObject *_wrap_Grid_IsCellEditControlShown(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8370,7 +8997,7 @@ static PyObject *_wrap_Grid_IsCurrentCellReadOnly(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8456,12 +9083,22 @@ static PyObject *_wrap_Grid_XYToCell(PyObject *self, PyObject *args, PyObject *k int arg3 ; wxGridCellCoords 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 *)"Oii:Grid_XYToCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_XYToCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxGrid_XYToCell(arg1,arg2,arg3); @@ -8486,12 +9123,17 @@ static PyObject *_wrap_Grid_YToRow(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_YToRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_YToRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->YToRow(arg2); @@ -8499,7 +9141,7 @@ static PyObject *_wrap_Grid_YToRow(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8512,12 +9154,17 @@ static PyObject *_wrap_Grid_XToCol(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_XToCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_XToCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->XToCol(arg2); @@ -8525,7 +9172,7 @@ static PyObject *_wrap_Grid_XToCol(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8538,12 +9185,17 @@ static PyObject *_wrap_Grid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObjec int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_YToEdgeOfRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_YToEdgeOfRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->YToEdgeOfRow(arg2); @@ -8551,7 +9203,7 @@ static PyObject *_wrap_Grid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8564,12 +9216,17 @@ static PyObject *_wrap_Grid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObjec int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_XToEdgeOfCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_XToEdgeOfCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->XToEdgeOfCol(arg2); @@ -8577,7 +9234,7 @@ static PyObject *_wrap_Grid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8591,12 +9248,22 @@ static PyObject *_wrap_Grid_CellToRect(PyObject *self, PyObject *args, PyObject int arg3 ; wxRect result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_CellToRect",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_CellToRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CellToRect(arg2,arg3); @@ -8633,7 +9300,7 @@ static PyObject *_wrap_Grid_GetGridCursorRow(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8658,7 +9325,7 @@ static PyObject *_wrap_Grid_GetGridCursorCol(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8673,16 +9340,26 @@ static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject * bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "wholeCellVisible", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Grid_IsVisible",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_IsVisible",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -8693,7 +9370,7 @@ static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8706,12 +9383,22 @@ static PyObject *_wrap_Grid_MakeCellVisible(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_MakeCellVisible",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_MakeCellVisible",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeCellVisible(arg2,arg3); @@ -8732,12 +9419,22 @@ static PyObject *_wrap_Grid_SetGridCursor(PyObject *self, PyObject *args, PyObje int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetGridCursor",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetGridCursor",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetGridCursor(arg2,arg3); @@ -8766,7 +9463,7 @@ static PyObject *_wrap_Grid_MoveCursorUp(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorUp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8776,7 +9473,7 @@ static PyObject *_wrap_Grid_MoveCursorUp(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8797,7 +9494,7 @@ static PyObject *_wrap_Grid_MoveCursorDown(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8807,7 +9504,7 @@ static PyObject *_wrap_Grid_MoveCursorDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8828,7 +9525,7 @@ static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorLeft",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8838,7 +9535,7 @@ static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8859,7 +9556,7 @@ static PyObject *_wrap_Grid_MoveCursorRight(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorRight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8869,7 +9566,7 @@ static PyObject *_wrap_Grid_MoveCursorRight(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8894,7 +9591,7 @@ static PyObject *_wrap_Grid_MovePageDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8919,7 +9616,7 @@ static PyObject *_wrap_Grid_MovePageUp(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8940,7 +9637,7 @@ static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorUpBlock",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8950,7 +9647,7 @@ static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8971,7 +9668,7 @@ static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorDownBlock",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8981,7 +9678,7 @@ static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9002,7 +9699,7 @@ static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorLeftBlock",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9012,7 +9709,7 @@ static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9033,7 +9730,7 @@ static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorRightBlock",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9043,7 +9740,7 @@ static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9068,7 +9765,7 @@ static PyObject *_wrap_Grid_GetDefaultRowLabelSize(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9093,7 +9790,7 @@ static PyObject *_wrap_Grid_GetRowLabelSize(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9118,7 +9815,7 @@ static PyObject *_wrap_Grid_GetDefaultColLabelSize(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9143,7 +9840,7 @@ static PyObject *_wrap_Grid_GetColLabelSize(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9331,7 +10028,7 @@ static PyObject *_wrap_Grid_GetColLabelTextOrientation(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9344,12 +10041,17 @@ static PyObject *_wrap_Grid_GetRowLabelValue(PyObject *self, PyObject *args, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_GetRowLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetRowLabelValue(arg2); @@ -9376,12 +10078,17 @@ static PyObject *_wrap_Grid_GetColLabelValue(PyObject *self, PyObject *args, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_GetColLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetColLabelValue(arg2); @@ -9478,7 +10185,7 @@ static PyObject *_wrap_Grid_GetCellHighlightPenWidth(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9503,7 +10210,7 @@ static PyObject *_wrap_Grid_GetCellHighlightROPenWidth(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9515,12 +10222,17 @@ static PyObject *_wrap_Grid_SetRowLabelSize(PyObject *self, PyObject *args, PyOb wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetRowLabelSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetRowLabelSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowLabelSize(arg2); @@ -9540,12 +10252,17 @@ static PyObject *_wrap_Grid_SetColLabelSize(PyObject *self, PyObject *args, PyOb wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColLabelSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColLabelSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColLabelSize(arg2); @@ -9658,12 +10375,22 @@ static PyObject *_wrap_Grid_SetRowLabelAlignment(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "horiz",(char *) "vert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetRowLabelAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowLabelAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowLabelAlignment(arg2,arg3); @@ -9684,12 +10411,22 @@ static PyObject *_wrap_Grid_SetColLabelAlignment(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "horiz",(char *) "vert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetColLabelAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColLabelAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColLabelAlignment(arg2,arg3); @@ -9709,12 +10446,17 @@ static PyObject *_wrap_Grid_SetColLabelTextOrientation(PyObject *self, PyObject wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "textOrientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColLabelTextOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColLabelTextOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColLabelTextOrientation(arg2); @@ -9736,13 +10478,18 @@ static PyObject *_wrap_Grid_SetRowLabelValue(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row","arg3", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetRowLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -9777,13 +10524,18 @@ static PyObject *_wrap_Grid_SetColLabelValue(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col","arg3", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetColLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -9878,12 +10630,17 @@ static PyObject *_wrap_Grid_SetCellHighlightPenWidth(PyObject *self, PyObject *a wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetCellHighlightPenWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetCellHighlightPenWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCellHighlightPenWidth(arg2); @@ -9903,12 +10660,17 @@ static PyObject *_wrap_Grid_SetCellHighlightROPenWidth(PyObject *self, PyObject wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetCellHighlightROPenWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetCellHighlightROPenWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCellHighlightROPenWidth(arg2); @@ -9937,7 +10699,7 @@ static PyObject *_wrap_Grid_EnableDragRowSize(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9997,7 +10759,7 @@ static PyObject *_wrap_Grid_CanDragRowSize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10018,7 +10780,7 @@ static PyObject *_wrap_Grid_EnableDragColSize(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -10078,7 +10840,7 @@ static PyObject *_wrap_Grid_CanDragColSize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10099,7 +10861,7 @@ static PyObject *_wrap_Grid_EnableDragGridSize(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -10159,7 +10921,7 @@ static PyObject *_wrap_Grid_CanDragGridSize(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10173,13 +10935,23 @@ static PyObject *_wrap_Grid_SetAttr(PyObject *self, PyObject *args, PyObject *kw int arg3 ; wxGridCellAttr *arg4 = (wxGridCellAttr *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "attr", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetAttr",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10201,13 +10973,18 @@ static PyObject *_wrap_Grid_SetRowAttr(PyObject *self, PyObject *args, PyObject int arg2 ; wxGridCellAttr *arg3 = (wxGridCellAttr *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "attr", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetRowAttr",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10229,13 +11006,18 @@ static PyObject *_wrap_Grid_SetColAttr(PyObject *self, PyObject *args, PyObject int arg2 ; wxGridCellAttr *arg3 = (wxGridCellAttr *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "attr", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetColAttr",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10256,12 +11038,17 @@ static PyObject *_wrap_Grid_SetColFormatBool(PyObject *self, PyObject *args, PyO wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColFormatBool",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColFormatBool",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColFormatBool(arg2); @@ -10281,12 +11068,17 @@ static PyObject *_wrap_Grid_SetColFormatNumber(PyObject *self, PyObject *args, P wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColFormatNumber",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColFormatNumber",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColFormatNumber(arg2); @@ -10308,12 +11100,31 @@ static PyObject *_wrap_Grid_SetColFormatFloat(PyObject *self, PyObject *args, Py int arg3 = (int) -1 ; int arg4 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "width",(char *) "precision", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:Grid_SetColFormatFloat",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Grid_SetColFormatFloat",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColFormatFloat(arg2,arg3,arg4); @@ -10335,13 +11146,18 @@ static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *self, PyObject *args, P wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetColFormatCustom",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColFormatCustom",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -10383,7 +11199,7 @@ static PyObject *_wrap_Grid_EnableGridLines(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -10419,7 +11235,7 @@ static PyObject *_wrap_Grid_GridLinesEnabled(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10444,7 +11260,7 @@ static PyObject *_wrap_Grid_GetDefaultRowSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10457,12 +11273,17 @@ static PyObject *_wrap_Grid_GetRowSize(PyObject *self, PyObject *args, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_GetRowSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetRowSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetRowSize(arg2); @@ -10470,7 +11291,7 @@ static PyObject *_wrap_Grid_GetRowSize(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10495,7 +11316,7 @@ static PyObject *_wrap_Grid_GetDefaultColSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10508,12 +11329,17 @@ static PyObject *_wrap_Grid_GetColSize(PyObject *self, PyObject *args, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_GetColSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetColSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetColSize(arg2); @@ -10521,7 +11347,7 @@ static PyObject *_wrap_Grid_GetColSize(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10564,12 +11390,22 @@ static PyObject *_wrap_Grid_GetCellBackgroundColour(PyObject *self, PyObject *ar int arg3 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellBackgroundColour",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellBackgroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCellBackgroundColour(arg2,arg3); @@ -10624,12 +11460,22 @@ static PyObject *_wrap_Grid_GetCellTextColour(PyObject *self, PyObject *args, Py int arg3 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellTextColour",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCellTextColour(arg2,arg3); @@ -10684,12 +11530,22 @@ static PyObject *_wrap_Grid_GetCellFont(PyObject *self, PyObject *args, PyObject int arg3 ; wxFont result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellFont",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellFont",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCellFont(arg2,arg3); @@ -10756,14 +11612,24 @@ static PyObject *_wrap_Grid_GetCellAlignment(PyObject *self, PyObject *args, PyO int temp4 ; int temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetCellAlignment(arg2,arg3,arg4,arg5); @@ -10804,7 +11670,7 @@ static PyObject *_wrap_Grid_GetDefaultCellOverflow(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10818,12 +11684,22 @@ static PyObject *_wrap_Grid_GetCellOverflow(PyObject *self, PyObject *args, PyOb int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellOverflow",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellOverflow",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetCellOverflow(arg2,arg3); @@ -10831,7 +11707,7 @@ static PyObject *_wrap_Grid_GetCellOverflow(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10848,14 +11724,24 @@ static PyObject *_wrap_Grid_GetCellSize(PyObject *self, PyObject *args, PyObject int temp4 ; int temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetCellSize(arg2,arg3,arg4,arg5); @@ -10884,16 +11770,21 @@ static PyObject *_wrap_Grid_SetDefaultRowSize(PyObject *self, PyObject *args, Py int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height",(char *) "resizeExistingRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_SetDefaultRowSize",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SetDefaultRowSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10917,12 +11808,22 @@ static PyObject *_wrap_Grid_SetRowSize(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetRowSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowSize(arg2,arg3); @@ -10943,16 +11844,21 @@ static PyObject *_wrap_Grid_SetDefaultColSize(PyObject *self, PyObject *args, Py int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "resizeExistingCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_SetDefaultColSize",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SetDefaultColSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10976,12 +11882,22 @@ static PyObject *_wrap_Grid_SetColSize(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetColSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColSize(arg2,arg3); @@ -11002,16 +11918,21 @@ static PyObject *_wrap_Grid_AutoSizeColumn(PyObject *self, PyObject *args, PyObj int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "setAsMin", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_AutoSizeColumn",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_AutoSizeColumn",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -11035,16 +11956,21 @@ static PyObject *_wrap_Grid_AutoSizeRow(PyObject *self, PyObject *args, PyObject int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "setAsMin", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_AutoSizeRow",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_AutoSizeRow",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -11076,7 +12002,7 @@ static PyObject *_wrap_Grid_AutoSizeColumns(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -11108,7 +12034,7 @@ static PyObject *_wrap_Grid_AutoSizeRows(PyObject *self, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -11155,12 +12081,17 @@ static PyObject *_wrap_Grid_AutoSizeRowLabelSize(PyObject *self, PyObject *args, wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_AutoSizeRowLabelSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_AutoSizeRowLabelSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AutoSizeRowLabelSize(arg2); @@ -11180,12 +12111,17 @@ static PyObject *_wrap_Grid_AutoSizeColLabelSize(PyObject *self, PyObject *args, wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_AutoSizeColLabelSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_AutoSizeColLabelSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AutoSizeColLabelSize(arg2); @@ -11206,12 +12142,22 @@ static PyObject *_wrap_Grid_SetColMinimalWidth(PyObject *self, PyObject *args, P int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetColMinimalWidth",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColMinimalWidth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColMinimalWidth(arg2,arg3); @@ -11232,12 +12178,22 @@ static PyObject *_wrap_Grid_SetRowMinimalHeight(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetRowMinimalHeight",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowMinimalHeight",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowMinimalHeight(arg2,arg3); @@ -11257,12 +12213,17 @@ static PyObject *_wrap_Grid_SetColMinimalAcceptableWidth(PyObject *self, PyObjec wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColMinimalAcceptableWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColMinimalAcceptableWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColMinimalAcceptableWidth(arg2); @@ -11282,12 +12243,17 @@ static PyObject *_wrap_Grid_SetRowMinimalAcceptableHeight(PyObject *self, PyObje wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetRowMinimalAcceptableHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetRowMinimalAcceptableHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowMinimalAcceptableHeight(arg2); @@ -11320,7 +12286,7 @@ static PyObject *_wrap_Grid_GetColMinimalAcceptableWidth(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11345,7 +12311,7 @@ static PyObject *_wrap_Grid_GetRowMinimalAcceptableHeight(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11391,13 +12357,23 @@ static PyObject *_wrap_Grid_SetCellBackgroundColour(PyObject *self, PyObject *ar wxColour *arg4 = 0 ; wxColour temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col","arg4", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellBackgroundColour",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellBackgroundColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; @@ -11455,13 +12431,23 @@ static PyObject *_wrap_Grid_SetCellTextColour(PyObject *self, PyObject *args, Py wxColour *arg4 = 0 ; wxColour temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col","arg4", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellTextColour",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellTextColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; @@ -11517,13 +12503,23 @@ static PyObject *_wrap_Grid_SetCellFont(PyObject *self, PyObject *args, PyObject int arg3 ; wxFont *arg4 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col","arg4", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellFont",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellFont",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -11548,12 +12544,22 @@ static PyObject *_wrap_Grid_SetDefaultCellAlignment(PyObject *self, PyObject *ar int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "horiz",(char *) "vert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetDefaultCellAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetDefaultCellAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDefaultCellAlignment(arg2,arg3); @@ -11576,12 +12582,32 @@ static PyObject *_wrap_Grid_SetCellAlignment(PyObject *self, PyObject *args, PyO int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "horiz",(char *) "vert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Grid_SetCellAlignment",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Grid_SetCellAlignment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCellAlignment(arg2,arg3,arg4,arg5); @@ -11609,7 +12635,7 @@ static PyObject *_wrap_Grid_SetDefaultCellOverflow(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetDefaultCellOverflow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11633,15 +12659,25 @@ static PyObject *_wrap_Grid_SetCellOverflow(PyObject *self, PyObject *args, PyOb int arg3 ; bool arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "allow", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellOverflow",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellOverflow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = (bool) SPyObj_AsBool(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -11666,12 +12702,32 @@ static PyObject *_wrap_Grid_SetCellSize(PyObject *self, PyObject *args, PyObject int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "num_rows",(char *) "num_cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Grid_SetCellSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Grid_SetCellSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCellSize(arg2,arg3,arg4,arg5); @@ -11720,13 +12776,23 @@ static PyObject *_wrap_Grid_SetCellRenderer(PyObject *self, PyObject *args, PyOb int arg3 ; wxGridCellRenderer *arg4 = (wxGridCellRenderer *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "renderer", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellRenderer",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellRenderer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGridCellRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11776,12 +12842,22 @@ static PyObject *_wrap_Grid_GetCellRenderer(PyObject *self, PyObject *args, PyOb int arg3 ; wxGridCellRenderer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellRenderer",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellRenderer",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellRenderer *)(arg1)->GetCellRenderer(arg2,arg3); @@ -11832,13 +12908,23 @@ static PyObject *_wrap_Grid_SetCellEditor(PyObject *self, PyObject *args, PyObje int arg3 ; wxGridCellEditor *arg4 = (wxGridCellEditor *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "editor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellEditor",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellEditor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11888,12 +12974,22 @@ static PyObject *_wrap_Grid_GetCellEditor(PyObject *self, PyObject *args, PyObje int arg3 ; wxGridCellEditor *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellEditor",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellEditor",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellEditor *)(arg1)->GetCellEditor(arg2,arg3); @@ -11917,12 +13013,22 @@ static PyObject *_wrap_Grid_GetCellValue(PyObject *self, PyObject *args, PyObjec int arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellValue",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCellValue(arg2,arg3); @@ -11951,13 +13057,23 @@ static PyObject *_wrap_Grid_SetCellValue(PyObject *self, PyObject *args, PyObjec wxString *arg4 = 0 ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellValue",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellValue",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -11992,12 +13108,22 @@ static PyObject *_wrap_Grid_IsReadOnly(PyObject *self, PyObject *args, PyObject int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_IsReadOnly",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_IsReadOnly",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxGrid const *)arg1)->IsReadOnly(arg2,arg3); @@ -12005,7 +13131,7 @@ static PyObject *_wrap_Grid_IsReadOnly(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12019,16 +13145,26 @@ static PyObject *_wrap_Grid_SetReadOnly(PyObject *self, PyObject *args, PyObject int arg3 ; bool arg4 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "isReadOnly", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Grid_SetReadOnly",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_SetReadOnly",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -12052,16 +13188,21 @@ static PyObject *_wrap_Grid_SelectRow(PyObject *self, PyObject *args, PyObject * int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "addToSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_SelectRow",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SelectRow",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -12085,16 +13226,21 @@ static PyObject *_wrap_Grid_SelectCol(PyObject *self, PyObject *args, PyObject * int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "addToSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_SelectCol",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SelectCol",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -12121,16 +13267,36 @@ static PyObject *_wrap_Grid_SelectBlock(PyObject *self, PyObject *args, PyObject int arg5 ; bool arg6 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "topRow",(char *) "leftCol",(char *) "bottomRow",(char *) "rightCol",(char *) "addToSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|O:Grid_SelectBlock",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Grid_SelectBlock",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -12190,7 +13356,7 @@ static PyObject *_wrap_Grid_IsSelection(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12228,12 +13394,22 @@ static PyObject *_wrap_Grid_IsInSelection(PyObject *self, PyObject *args, PyObje int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_IsInSelection",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_IsInSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsInSelection(arg2,arg3); @@ -12241,7 +13417,7 @@ static PyObject *_wrap_Grid_IsInSelection(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12400,12 +13576,17 @@ static PyObject *_wrap_Grid_DeselectRow(PyObject *self, PyObject *args, PyObject wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_DeselectRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_DeselectRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeselectRow(arg2); @@ -12425,12 +13606,17 @@ static PyObject *_wrap_Grid_DeselectCol(PyObject *self, PyObject *args, PyObject wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_DeselectCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_DeselectCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeselectCol(arg2); @@ -12451,12 +13637,22 @@ static PyObject *_wrap_Grid_DeselectCell(PyObject *self, PyObject *args, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_DeselectCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_DeselectCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeselectCell(arg2,arg3); @@ -12687,12 +13883,22 @@ static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *self, PyObject *ar int arg3 ; wxGridCellEditor *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetDefaultEditorForCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetDefaultEditorForCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellEditor *)((wxGrid const *)arg1)->GetDefaultEditorForCell(arg2,arg3); @@ -12716,12 +13922,22 @@ static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *self, PyObject * int arg3 ; wxGridCellRenderer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetDefaultRendererForCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetDefaultRendererForCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellRenderer *)((wxGrid const *)arg1)->GetDefaultRendererForCell(arg2,arg3); @@ -12830,12 +14046,22 @@ static PyObject *_wrap_Grid_SetMargins(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "extraWidth",(char *) "extraHeight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetMargins",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetMargins",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -12980,7 +14206,13 @@ static PyObject *_wrap_new_GridEvent(PyObject *self, PyObject *args, PyObject *k bool arg11 = (bool) False ; bool arg12 = (bool) False ; wxGridEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; @@ -12990,35 +14222,67 @@ static PyObject *_wrap_new_GridEvent(PyObject *self, PyObject *args, PyObject *k (char *) "id",(char *) "type",(char *) "obj",(char *) "row",(char *) "col",(char *) "x",(char *) "y",(char *) "sel",(char *) "control",(char *) "shift",(char *) "alt",(char *) "meta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiO|iiiiOOOOO:new_GridEvent",kwnames,&arg1,&arg2,&obj2,&arg4,&arg5,&arg6,&arg7,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOOOO:new_GridEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { - arg8 = (bool) SPyObj_AsBool(obj7); + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { { - arg9 = (bool) SPyObj_AsBool(obj8); + arg9 = (bool) SWIG_PyObj_AsBool(obj8); if (PyErr_Occurred()) SWIG_fail; } } if (obj9) { { - arg10 = (bool) SPyObj_AsBool(obj9); + arg10 = (bool) SWIG_PyObj_AsBool(obj9); if (PyErr_Occurred()) SWIG_fail; } } if (obj10) { { - arg11 = (bool) SPyObj_AsBool(obj10); + arg11 = (bool) SWIG_PyObj_AsBool(obj10); if (PyErr_Occurred()) SWIG_fail; } } if (obj11) { { - arg12 = (bool) SPyObj_AsBool(obj11); + arg12 = (bool) SWIG_PyObj_AsBool(obj11); if (PyErr_Occurred()) SWIG_fail; } } @@ -13054,7 +14318,7 @@ static PyObject *_wrap_GridEvent_GetRow(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13079,7 +14343,7 @@ static PyObject *_wrap_GridEvent_GetCol(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13133,7 +14397,7 @@ static PyObject *_wrap_GridEvent_Selecting(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13158,7 +14422,7 @@ static PyObject *_wrap_GridEvent_ControlDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13183,7 +14447,7 @@ static PyObject *_wrap_GridEvent_MetaDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13208,7 +14472,7 @@ static PyObject *_wrap_GridEvent_ShiftDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13233,7 +14497,7 @@ static PyObject *_wrap_GridEvent_AltDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13260,7 +14524,12 @@ static PyObject *_wrap_new_GridSizeEvent(PyObject *self, PyObject *args, PyObjec bool arg9 = (bool) False ; bool arg10 = (bool) False ; wxGridSizeEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; @@ -13269,29 +14538,55 @@ static PyObject *_wrap_new_GridSizeEvent(PyObject *self, PyObject *args, PyObjec (char *) "id",(char *) "type",(char *) "obj",(char *) "rowOrCol",(char *) "x",(char *) "y",(char *) "control",(char *) "shift",(char *) "alt",(char *) "meta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiO|iiiOOOO:new_GridSizeEvent",kwnames,&arg1,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6,&obj7,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOO:new_GridSizeEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { { - arg8 = (bool) SPyObj_AsBool(obj7); + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { { - arg9 = (bool) SPyObj_AsBool(obj8); + arg9 = (bool) SWIG_PyObj_AsBool(obj8); if (PyErr_Occurred()) SWIG_fail; } } if (obj9) { { - arg10 = (bool) SPyObj_AsBool(obj9); + arg10 = (bool) SWIG_PyObj_AsBool(obj9); if (PyErr_Occurred()) SWIG_fail; } } @@ -13327,7 +14622,7 @@ static PyObject *_wrap_GridSizeEvent_GetRowOrCol(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13381,7 +14676,7 @@ static PyObject *_wrap_GridSizeEvent_ControlDown(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13406,7 +14701,7 @@ static PyObject *_wrap_GridSizeEvent_MetaDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13431,7 +14726,7 @@ static PyObject *_wrap_GridSizeEvent_ShiftDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13456,7 +14751,7 @@ static PyObject *_wrap_GridSizeEvent_AltDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13485,6 +14780,8 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args, wxGridRangeSelectEvent *result; wxGridCellCoords temp4 ; wxGridCellCoords temp5 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -13497,7 +14794,15 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args, (char *) "id",(char *) "type",(char *) "obj",(char *) "topLeft",(char *) "bottomRight",(char *) "sel",(char *) "control",(char *) "shift",(char *) "alt",(char *) "meta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiOOO|OOOOO:new_GridRangeSelectEvent",kwnames,&arg1,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOOOO:new_GridRangeSelectEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg4 = &temp4; @@ -13509,31 +14814,31 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args, } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { { - arg8 = (bool) SPyObj_AsBool(obj7); + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { { - arg9 = (bool) SPyObj_AsBool(obj8); + arg9 = (bool) SWIG_PyObj_AsBool(obj8); if (PyErr_Occurred()) SWIG_fail; } } if (obj9) { { - arg10 = (bool) SPyObj_AsBool(obj9); + arg10 = (bool) SWIG_PyObj_AsBool(obj9); if (PyErr_Occurred()) SWIG_fail; } } @@ -13627,7 +14932,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetTopRow(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13652,7 +14957,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetBottomRow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13677,7 +14982,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetLeftCol(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13702,7 +15007,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetRightCol(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13727,7 +15032,7 @@ static PyObject *_wrap_GridRangeSelectEvent_Selecting(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13752,7 +15057,7 @@ static PyObject *_wrap_GridRangeSelectEvent_ControlDown(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13777,7 +15082,7 @@ static PyObject *_wrap_GridRangeSelectEvent_MetaDown(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13802,7 +15107,7 @@ static PyObject *_wrap_GridRangeSelectEvent_ShiftDown(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13827,7 +15132,7 @@ static PyObject *_wrap_GridRangeSelectEvent_AltDown(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13850,14 +15155,34 @@ static PyObject *_wrap_new_GridEditorCreatedEvent(PyObject *self, PyObject *args int arg5 ; wxControl *arg6 = (wxControl *) 0 ; wxGridEditorCreatedEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "id",(char *) "type",(char *) "obj",(char *) "row",(char *) "col",(char *) "ctrl", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiOiiO:new_GridEditorCreatedEvent",kwnames,&arg1,&arg2,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GridEditorCreatedEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13891,7 +15216,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_GetRow(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13916,7 +15241,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_GetCol(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13955,12 +15280,17 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetRow(PyObject *self, PyObject *a wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridEditorCreatedEvent_SetRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridEditorCreatedEvent_SetRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridEditorCreatedEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRow(arg2); @@ -13980,12 +15310,17 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetCol(PyObject *self, PyObject *a wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridEditorCreatedEvent_SetCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridEditorCreatedEvent_SetCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridEditorCreatedEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCol(arg2); @@ -15515,6 +16850,7 @@ static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0 static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}}; static swig_type_info _swigt__p_wxGridTableMessage[] = {{"_p_wxGridTableMessage", 0, "wxGridTableMessage *", 0},{"_p_wxGridTableMessage"},{0}}; static swig_type_info _swigt__p_wxGrid[] = {{"_p_wxGrid", 0, "wxGrid *", 0},{"_p_wxGrid"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxGrid", _p_wxGridTo_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_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0},{"_p_wxGridSizeEvent", _p_wxGridSizeEventTo_p_wxNotifyEvent},{"_p_wxGridRangeSelectEvent", _p_wxGridRangeSelectEventTo_p_wxNotifyEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxNotifyEvent},{"_p_wxGridEvent", _p_wxGridEventTo_p_wxNotifyEvent},{"_p_wxNotifyEvent"},{0}}; static swig_type_info _swigt__p_wxGridRangeSelectEvent[] = {{"_p_wxGridRangeSelectEvent", 0, "wxGridRangeSelectEvent *", 0},{"_p_wxGridRangeSelectEvent"},{0}}; @@ -15535,11 +16871,11 @@ static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{ static swig_type_info _swigt__p_wxGridEvent[] = {{"_p_wxGridEvent", 0, "wxGridEvent *", 0},{"_p_wxGridEvent"},{0}}; static swig_type_info _swigt__p_wxGridEditorCreatedEvent[] = {{"_p_wxGridEditorCreatedEvent", 0, "wxGridEditorCreatedEvent *", 0},{"_p_wxGridEditorCreatedEvent"},{0}}; static swig_type_info _swigt__p_wxGridTableBase[] = {{"_p_wxGridTableBase", 0, "wxGridTableBase *", 0},{"_p_wxGridStringTable", _p_wxGridStringTableTo_p_wxGridTableBase},{"_p_wxGridTableBase"},{"_p_wxPyGridTableBase", _p_wxPyGridTableBaseTo_p_wxGridTableBase},{0}}; -static swig_type_info _swigt__p_wxGridCellFloatEditor[] = {{"_p_wxGridCellFloatEditor", 0, "wxGridCellFloatEditor *", 0},{"_p_wxGridCellFloatEditor"},{0}}; static swig_type_info _swigt__p_wxGridCellNumberEditor[] = {{"_p_wxGridCellNumberEditor", 0, "wxGridCellNumberEditor *", 0},{"_p_wxGridCellNumberEditor"},{0}}; static swig_type_info _swigt__p_wxPyGridCellEditor[] = {{"_p_wxPyGridCellEditor", 0, "wxPyGridCellEditor *", 0},{"_p_wxPyGridCellEditor"},{0}}; static swig_type_info _swigt__p_wxGridCellEditor[] = {{"_p_wxGridCellEditor", 0, "wxGridCellEditor *", 0},{"_p_wxGridCellEditor"},{"_p_wxPyGridCellEditor", _p_wxPyGridCellEditorTo_p_wxGridCellEditor},{"_p_wxGridCellTextEditor", _p_wxGridCellTextEditorTo_p_wxGridCellEditor},{"_p_wxGridCellNumberEditor", _p_wxGridCellNumberEditorTo_p_wxGridCellEditor},{"_p_wxGridCellFloatEditor", _p_wxGridCellFloatEditorTo_p_wxGridCellEditor},{"_p_wxGridCellBoolEditor", _p_wxGridCellBoolEditorTo_p_wxGridCellEditor},{"_p_wxGridCellAutoWrapStringEditor", _p_wxGridCellAutoWrapStringEditorTo_p_wxGridCellEditor},{"_p_wxGridCellChoiceEditor", _p_wxGridCellChoiceEditorTo_p_wxGridCellEditor},{"_p_wxGridCellEnumEditor", _p_wxGridCellEnumEditorTo_p_wxGridCellEditor},{0}}; static swig_type_info _swigt__p_wxGridCellTextEditor[] = {{"_p_wxGridCellTextEditor", 0, "wxGridCellTextEditor *", 0},{"_p_wxGridCellTextEditor"},{"_p_wxGridCellNumberEditor", _p_wxGridCellNumberEditorTo_p_wxGridCellTextEditor},{"_p_wxGridCellFloatEditor", _p_wxGridCellFloatEditorTo_p_wxGridCellTextEditor},{"_p_wxGridCellAutoWrapStringEditor", _p_wxGridCellAutoWrapStringEditorTo_p_wxGridCellTextEditor},{0}}; +static swig_type_info _swigt__p_wxGridCellFloatEditor[] = {{"_p_wxGridCellFloatEditor", 0, "wxGridCellFloatEditor *", 0},{"_p_wxGridCellFloatEditor"},{0}}; static swig_type_info _swigt__p_wxGridCellBoolEditor[] = {{"_p_wxGridCellBoolEditor", 0, "wxGridCellBoolEditor *", 0},{"_p_wxGridCellBoolEditor"},{0}}; static swig_type_info _swigt__p_wxPyGridTableBase[] = {{"_p_wxPyGridTableBase", 0, "wxPyGridTableBase *", 0},{"_p_wxPyGridTableBase"},{0}}; static swig_type_info _swigt__p_wxGridStringTable[] = {{"_p_wxGridStringTable", 0, "wxGridStringTable *", 0},{"_p_wxGridStringTable"},{0}}; @@ -15568,6 +16904,7 @@ _swigt__p_wxColour, _swigt__p_wxDC, _swigt__p_wxGridTableMessage, _swigt__p_wxGrid, +_swigt__p_char, _swigt__p_wxPanel, _swigt__p_wxNotifyEvent, _swigt__p_wxGridRangeSelectEvent, @@ -15588,11 +16925,11 @@ _swigt__p_wxPoint, _swigt__p_wxGridEvent, _swigt__p_wxGridEditorCreatedEvent, _swigt__p_wxGridTableBase, -_swigt__p_wxGridCellFloatEditor, _swigt__p_wxGridCellNumberEditor, _swigt__p_wxPyGridCellEditor, _swigt__p_wxGridCellEditor, _swigt__p_wxGridCellTextEditor, +_swigt__p_wxGridCellFloatEditor, _swigt__p_wxGridCellBoolEditor, _swigt__p_wxPyGridTableBase, _swigt__p_wxGridStringTable, @@ -15621,39 +16958,6 @@ static swig_const_info swig_const_table[] = { { SWIG_PY_STRING, (char*)"GRID_VALUE_LONG", 0, 0, (void *)"long", 0}, { SWIG_PY_STRING, (char*)"GRID_VALUE_CHOICEINT", 0, 0, (void *)"choiceint", 0}, { SWIG_PY_STRING, (char*)"GRID_VALUE_DATETIME", 0, 0, (void *)"datetime", 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Any", (long) wxGridCellAttr::Any, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Default", (long) wxGridCellAttr::Default, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Cell", (long) wxGridCellAttr::Cell, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Row", (long) wxGridCellAttr::Row, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Col", (long) wxGridCellAttr::Col, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Merged", (long) wxGridCellAttr::Merged, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_REQUEST_VIEW_GET_VALUES", (long) wxGRIDTABLE_REQUEST_VIEW_GET_VALUES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_REQUEST_VIEW_SEND_VALUES", (long) wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_ROWS_INSERTED", (long) wxGRIDTABLE_NOTIFY_ROWS_INSERTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_ROWS_APPENDED", (long) wxGRIDTABLE_NOTIFY_ROWS_APPENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_ROWS_DELETED", (long) wxGRIDTABLE_NOTIFY_ROWS_DELETED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_COLS_INSERTED", (long) wxGRIDTABLE_NOTIFY_COLS_INSERTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_COLS_APPENDED", (long) wxGRIDTABLE_NOTIFY_COLS_APPENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_COLS_DELETED", (long) wxGRIDTABLE_NOTIFY_COLS_DELETED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Grid_wxGridSelectCells", (long) wxGrid::wxGridSelectCells, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Grid_wxGridSelectRows", (long) wxGrid::wxGridSelectRows, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Grid_wxGridSelectColumns", (long) wxGrid::wxGridSelectColumns, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_LEFT_CLICK", (long) wxEVT_GRID_CELL_LEFT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_RIGHT_CLICK", (long) wxEVT_GRID_CELL_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_LEFT_DCLICK", (long) wxEVT_GRID_CELL_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_RIGHT_DCLICK", (long) wxEVT_GRID_CELL_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_LABEL_LEFT_CLICK", (long) wxEVT_GRID_LABEL_LEFT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_LABEL_RIGHT_CLICK", (long) wxEVT_GRID_LABEL_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_LABEL_LEFT_DCLICK", (long) wxEVT_GRID_LABEL_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_LABEL_RIGHT_DCLICK", (long) wxEVT_GRID_LABEL_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_ROW_SIZE", (long) wxEVT_GRID_ROW_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_COL_SIZE", (long) wxEVT_GRID_COL_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_RANGE_SELECT", (long) wxEVT_GRID_RANGE_SELECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_CHANGE", (long) wxEVT_GRID_CELL_CHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_SELECT_CELL", (long) wxEVT_GRID_SELECT_CELL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_EDITOR_SHOWN", (long) wxEVT_GRID_EDITOR_SHOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_EDITOR_HIDDEN", (long) wxEVT_GRID_EDITOR_HIDDEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_EDITOR_CREATED", (long) wxEVT_GRID_EDITOR_CREATED, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -15684,6 +16988,23 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"DateTimeFormatStr",_wrap_DateTimeFormatStr_get, _wrap_DateTimeFormatStr_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set); + PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_PyObj_FromInt((int)wxGridCellAttr::Any)); + PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_PyObj_FromInt((int)wxGridCellAttr::Default)); + PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_PyObj_FromInt((int)wxGridCellAttr::Cell)); + PyDict_SetItemString(d,"GridCellAttr_Row", SWIG_PyObj_FromInt((int)wxGridCellAttr::Row)); + PyDict_SetItemString(d,"GridCellAttr_Col", SWIG_PyObj_FromInt((int)wxGridCellAttr::Col)); + PyDict_SetItemString(d,"GridCellAttr_Merged", SWIG_PyObj_FromInt((int)wxGridCellAttr::Merged)); + PyDict_SetItemString(d,"GRIDTABLE_REQUEST_VIEW_GET_VALUES", SWIG_PyObj_FromInt((int)wxGRIDTABLE_REQUEST_VIEW_GET_VALUES)); + PyDict_SetItemString(d,"GRIDTABLE_REQUEST_VIEW_SEND_VALUES", SWIG_PyObj_FromInt((int)wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_INSERTED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_INSERTED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_APPENDED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_APPENDED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_DELETED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_DELETED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_INSERTED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_INSERTED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_APPENDED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_APPENDED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_DELETED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_DELETED)); + PyDict_SetItemString(d,"Grid_wxGridSelectCells", SWIG_PyObj_FromInt((int)wxGrid::wxGridSelectCells)); + PyDict_SetItemString(d,"Grid_wxGridSelectRows", SWIG_PyObj_FromInt((int)wxGrid::wxGridSelectRows)); + PyDict_SetItemString(d,"Grid_wxGridSelectColumns", SWIG_PyObj_FromInt((int)wxGrid::wxGridSelectColumns)); PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_CLICK)); PyDict_SetItemString(d, "wxEVT_GRID_CELL_RIGHT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_RIGHT_CLICK)); PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_DCLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_DCLICK)); diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp index b6460e646d..774feda9e2 100644 --- a/wxPython/src/mac/html_wrap.cpp +++ b/wxPython/src/mac/html_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -390,49 +239,50 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxMouseEvent swig_types[6] #define SWIGTYPE_p_wxHtmlWordCell swig_types[7] #define SWIGTYPE_p_wxHtmlHelpData swig_types[8] -#define SWIGTYPE_p_wxHtmlWinParser swig_types[9] -#define SWIGTYPE_p_wxHtmlParser swig_types[10] -#define SWIGTYPE_p_wxPanel swig_types[11] -#define SWIGTYPE_p_wxHtmlFontCell swig_types[12] +#define SWIGTYPE_p_char swig_types[9] +#define SWIGTYPE_p_wxHtmlWinParser swig_types[10] +#define SWIGTYPE_p_wxHtmlParser swig_types[11] +#define SWIGTYPE_p_wxPanel swig_types[12] #define SWIGTYPE_p_wxFont swig_types[13] #define SWIGTYPE_p_wxHtmlColourCell swig_types[14] #define SWIGTYPE_p_wxPyHtmlWindow swig_types[15] #define SWIGTYPE_p_wxScrolledWindow swig_types[16] #define SWIGTYPE_p_wxWindow swig_types[17] #define SWIGTYPE_p_wxTopLevelWindow swig_types[18] -#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[19] -#define SWIGTYPE_p_wxHtmlSelection swig_types[20] -#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[21] -#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[22] -#define SWIGTYPE_p_wxObject swig_types[23] -#define SWIGTYPE_p_wxString swig_types[24] -#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[25] -#define SWIGTYPE_p_wxHtmlTagHandler swig_types[26] -#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[27] -#define SWIGTYPE_p_wxEvtHandler swig_types[28] -#define SWIGTYPE_p_wxPoint swig_types[29] -#define SWIGTYPE_p_wxHtmlHelpController swig_types[30] -#define SWIGTYPE_p_wxCursor swig_types[31] -#define SWIGTYPE_p_wxFileSystem swig_types[32] -#define SWIGTYPE_p_wxHtmlBookRecArray swig_types[33] -#define SWIGTYPE_p_wxPyPrintout swig_types[34] -#define SWIGTYPE_p_wxHtmlPrintout swig_types[35] -#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[36] -#define SWIGTYPE_p_wxHtmlContentsItem swig_types[37] -#define SWIGTYPE_p_wxConfigBase swig_types[38] -#define SWIGTYPE_p_wxPrintData swig_types[39] -#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[40] -#define SWIGTYPE_p_wxHtmlRenderingState swig_types[41] -#define SWIGTYPE_p_wxFrame swig_types[42] -#define SWIGTYPE_p_wxPyHtmlFilter swig_types[43] -#define SWIGTYPE_p_wxHtmlFilter swig_types[44] -#define SWIGTYPE_p_wxHtmlCell swig_types[45] -#define SWIGTYPE_p_wxHtmlContainerCell swig_types[46] -#define SWIGTYPE_p_wxHtmlTag swig_types[47] -#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[48] -#define SWIGTYPE_p_int swig_types[49] -#define SWIGTYPE_p_wxHtmlBookRecord swig_types[50] -static swig_type_info *swig_types[52]; +#define SWIGTYPE_p_wxHtmlFontCell swig_types[19] +#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[20] +#define SWIGTYPE_p_wxHtmlSelection swig_types[21] +#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[22] +#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[23] +#define SWIGTYPE_p_wxObject swig_types[24] +#define SWIGTYPE_p_wxString swig_types[25] +#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[26] +#define SWIGTYPE_p_wxHtmlTagHandler swig_types[27] +#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[28] +#define SWIGTYPE_p_wxEvtHandler swig_types[29] +#define SWIGTYPE_p_wxPoint swig_types[30] +#define SWIGTYPE_p_wxHtmlHelpController swig_types[31] +#define SWIGTYPE_p_wxCursor swig_types[32] +#define SWIGTYPE_p_wxFileSystem swig_types[33] +#define SWIGTYPE_p_wxHtmlBookRecArray swig_types[34] +#define SWIGTYPE_p_wxPyPrintout swig_types[35] +#define SWIGTYPE_p_wxHtmlPrintout swig_types[36] +#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[37] +#define SWIGTYPE_p_wxHtmlContentsItem swig_types[38] +#define SWIGTYPE_p_wxConfigBase swig_types[39] +#define SWIGTYPE_p_wxPrintData swig_types[40] +#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[41] +#define SWIGTYPE_p_wxHtmlRenderingState swig_types[42] +#define SWIGTYPE_p_wxFrame swig_types[43] +#define SWIGTYPE_p_wxPyHtmlFilter swig_types[44] +#define SWIGTYPE_p_wxHtmlFilter swig_types[45] +#define SWIGTYPE_p_wxHtmlCell swig_types[46] +#define SWIGTYPE_p_wxHtmlContainerCell swig_types[47] +#define SWIGTYPE_p_wxHtmlTag swig_types[48] +#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[49] +#define SWIGTYPE_p_int swig_types[50] +#define SWIGTYPE_p_wxHtmlBookRecord swig_types[51] +static swig_type_info *swig_types[53]; /* -------- TYPES TABLE (END) -------- */ @@ -444,6 +294,44 @@ static swig_type_info *swig_types[52]; #define SWIG_name "_html" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/pyistream.h" @@ -458,6 +346,23 @@ static swig_type_info *swig_types[52]; static const wxString wxPyHtmlWindowNameStr(wxT("htmlWindow")); static const wxString wxPyHtmlPrintoutTitleStr(wxT("Printout")); static const wxString wxPyHtmlPrintingTitleStr(wxT("Printing")); + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + void wxHtmlWinParser_SetFonts(wxHtmlWinParser *self,wxString normal_face,wxString fixed_face,PyObject *sizes){ int* temp = NULL; if (sizes) temp = int_LIST_helper(sizes); @@ -592,6 +497,32 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + // here's the C++ version class wxPyHtmlFilter : public wxHtmlFilter { DECLARE_ABSTRACT_CLASS(wxPyHtmlFilter); @@ -750,6 +681,29 @@ void wxHtmlPrintout_SetFonts(wxHtmlPrintout *self,wxString normal_face,wxString if (temp) delete [] temp; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + + +SWIGSTATIC(float) +SWIG_PyObj_AsFloat(PyObject *obj) +{ + return SWIG_PyObj_AsFloatConv(obj, SWIG_PyObj_AsDouble); +} + void wxHtmlEasyPrinting_SetFonts(wxHtmlEasyPrinting *self,wxString normal_face,wxString fixed_face,PyObject *sizes){ int* temp = NULL; if (sizes) temp = int_LIST_helper(sizes); @@ -765,7 +719,7 @@ wxHtmlBookRecord *wxHtmlContentsItem_GetBook(wxHtmlContentsItem *self){ return s #ifdef __cplusplus extern "C" { #endif -static int _wrap_HtmlWindowNameStr_set(PyObject *_val) { +static int _wrap_HtmlWindowNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable HtmlWindowNameStr is read-only."); return 1; } @@ -785,7 +739,7 @@ static PyObject *_wrap_HtmlWindowNameStr_get() { } -static int _wrap_HtmlPrintoutTitleStr_set(PyObject *_val) { +static int _wrap_HtmlPrintoutTitleStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintoutTitleStr is read-only."); return 1; } @@ -805,7 +759,7 @@ static PyObject *_wrap_HtmlPrintoutTitleStr_get() { } -static int _wrap_HtmlPrintingTitleStr_set(PyObject *_val) { +static int _wrap_HtmlPrintingTitleStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintingTitleStr is read-only."); return 1; } @@ -1114,7 +1068,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -1138,17 +1092,24 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "par",(char *) "with_commas", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlTag_GetParam",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlTag_GetParam",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlTag,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetParam((wxString const &)*arg2,arg3); @@ -1226,7 +1187,7 @@ static PyObject *_wrap_HtmlTag_HasEnding(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1251,7 +1212,7 @@ static PyObject *_wrap_HtmlTag_GetBeginPos(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1276,7 +1237,7 @@ static PyObject *_wrap_HtmlTag_GetEndPos1(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1301,7 +1262,7 @@ static PyObject *_wrap_HtmlTag_GetEndPos2(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1482,12 +1443,22 @@ static PyObject *_wrap_HtmlParser_DoParsing(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "begin_pos",(char *) "end_pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:HtmlParser_DoParsing",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlParser_DoParsing",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DoParsing(arg2,arg3); @@ -1749,7 +1720,7 @@ static PyObject *_wrap_HtmlWinParser_GetCharHeight(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1774,7 +1745,7 @@ static PyObject *_wrap_HtmlWinParser_GetCharWidth(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1974,7 +1945,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontSize(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1986,12 +1957,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *self, PyObject *args, wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontSize(arg2); @@ -2024,7 +2000,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontBold(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2036,12 +2012,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *self, PyObject *args, wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontBold",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontBold",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontBold(arg2); @@ -2074,7 +2055,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontItalic(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2086,12 +2067,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *self, PyObject *arg wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontItalic",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontItalic",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontItalic(arg2); @@ -2124,7 +2110,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontUnderlined(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2136,12 +2122,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *self, PyObject wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontUnderlined",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontUnderlined",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontUnderlined(arg2); @@ -2174,7 +2165,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontFixed(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2186,12 +2177,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *self, PyObject *args wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontFixed",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontFixed",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontFixed(arg2); @@ -2224,7 +2220,7 @@ static PyObject *_wrap_HtmlWinParser_GetAlign(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2236,12 +2232,17 @@ static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *self, PyObject *args, Py wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "a", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetAlign",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetAlign",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlign(arg2); @@ -3169,7 +3170,7 @@ static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3234,12 +3235,17 @@ static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *self, PyOb wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlRenderingState_SetSelectionState",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlRenderingState_SetSelectionState",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlRenderingState,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxHtmlSelectionState) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelectionState((wxHtmlSelectionState )arg2); @@ -3272,7 +3278,7 @@ static PyObject *_wrap_HtmlRenderingState_GetSelectionState(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3790,7 +3796,7 @@ static PyObject *_wrap_HtmlCell_GetPosX(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3815,7 +3821,7 @@ static PyObject *_wrap_HtmlCell_GetPosY(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3840,7 +3846,7 @@ static PyObject *_wrap_HtmlCell_GetWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3865,7 +3871,7 @@ static PyObject *_wrap_HtmlCell_GetHeight(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3890,7 +3896,7 @@ static PyObject *_wrap_HtmlCell_GetDescent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3978,12 +3984,26 @@ static PyObject *_wrap_HtmlCell_GetLink(PyObject *self, PyObject *args, PyObject int arg3 = (int) 0 ; wxHtmlLinkInfo *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 *)"O|ii:HtmlCell_GetLink",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:HtmlCell_GetLink",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxHtmlLinkInfo *)(arg1)->GetLink(arg2,arg3); @@ -4120,7 +4140,7 @@ static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4217,12 +4237,22 @@ static PyObject *_wrap_HtmlCell_SetPos(PyObject *self, PyObject *args, PyObject int arg2 ; int 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 *)"Oii:HtmlCell_SetPos",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlCell_SetPos",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPos(arg2,arg3); @@ -4242,12 +4272,17 @@ static PyObject *_wrap_HtmlCell_Layout(PyObject *self, PyObject *args, PyObject wxHtmlCell *arg1 = (wxHtmlCell *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlCell_Layout",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_Layout",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Layout(arg2); @@ -4273,17 +4308,37 @@ static PyObject *_wrap_HtmlCell_Draw(PyObject *self, PyObject *args, PyObject *k wxHtmlRenderingInfo *arg7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "view_y1",(char *) "view_y2",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiiiiO:HtmlCell_Draw",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:HtmlCell_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxHtmlRenderingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4311,17 +4366,27 @@ static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *self, PyObject *args, Py wxHtmlRenderingInfo *arg5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiiO:HtmlCell_DrawInvisible",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:HtmlCell_DrawInvisible",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxHtmlRenderingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg5 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4347,13 +4412,18 @@ static PyObject *_wrap_HtmlCell_Find(PyObject *self, PyObject *args, PyObject *k void *arg3 = (void *) 0 ; wxHtmlCell *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "condition",(char *) "param", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:HtmlCell_Find",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlCell_Find",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4395,7 +4465,7 @@ static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -4419,7 +4489,7 @@ static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_SetCanLiveOnPagebreak",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4454,7 +4524,7 @@ static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4479,7 +4549,7 @@ static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4494,16 +4564,26 @@ static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *self, PyObject *args, Py unsigned int arg4 = (unsigned int) wxHTML_FIND_EXACT ; wxHtmlCell *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:HtmlCell_FindCellByPos",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlCell_FindCellByPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (unsigned int) SPyObj_AsUnsignedInt(obj3); + arg4 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -4618,7 +4698,7 @@ static PyObject *_wrap_HtmlCell_GetDepth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -4646,7 +4726,7 @@ static PyObject *_wrap_HtmlCell_IsBefore(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4802,12 +4882,17 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *self, PyObject *a wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "al", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlContainerCell_SetAlignHor",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_SetAlignHor",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignHor(arg2); @@ -4840,7 +4925,7 @@ static PyObject *_wrap_HtmlContainerCell_GetAlignHor(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4852,12 +4937,17 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *self, PyObject *a wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "al", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlContainerCell_SetAlignVer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_SetAlignVer",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignVer(arg2); @@ -4890,7 +4980,7 @@ static PyObject *_wrap_HtmlContainerCell_GetAlignVer(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4904,12 +4994,29 @@ static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *self, PyObject *arg int arg3 ; int arg4 = (int) wxHTML_UNITS_PIXELS ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i",(char *) "what",(char *) "units", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:HtmlContainerCell_SetIndent",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlContainerCell_SetIndent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetIndent(arg2,arg3,arg4); @@ -4930,12 +5037,17 @@ static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *self, PyObject *arg int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlContainerCell_GetIndent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_GetIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetIndent(arg2); @@ -4943,7 +5055,7 @@ static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4956,12 +5068,17 @@ static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *self, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlContainerCell_GetIndentUnits",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_GetIndentUnits",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetIndentUnits(arg2); @@ -4969,7 +5086,7 @@ static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5012,12 +5129,22 @@ static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *self, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "units", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:HtmlContainerCell_SetWidthFloat",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlContainerCell_SetWidthFloat",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidthFloat(arg2,arg3); @@ -5068,12 +5195,24 @@ static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *self, PyObject * int arg2 ; int arg3 = (int) wxHTML_ALIGN_TOP ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:HtmlContainerCell_SetMinHeight",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlContainerCell_SetMinHeight",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinHeight(arg2,arg3); @@ -5225,13 +5364,20 @@ static PyObject *_wrap_new_HtmlColourCell(PyObject *self, PyObject *args, PyObje wxHtmlColourCell *result; wxColour *argp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "clr",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_HtmlColourCell",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_HtmlColourCell",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &argp1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; arg1 = *argp1; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxHtmlColourCell *)new wxHtmlColourCell(arg1,arg2); @@ -5291,12 +5437,19 @@ static PyObject *_wrap_new_HtmlWidgetCell(PyObject *self, PyObject *args, PyObje int arg2 = (int) 0 ; wxHtmlWidgetCell *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "wnd",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_HtmlWidgetCell",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_HtmlWidgetCell",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxHtmlWidgetCell *)new wxHtmlWidgetCell(arg1,arg2); @@ -5393,15 +5546,23 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * 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 *)"O|iOOiO:new_HtmlWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_HtmlWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -5414,6 +5575,12 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -5487,16 +5654,24 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOiO:HtmlWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:HtmlWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -5509,6 +5684,12 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -5523,7 +5704,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -5594,7 +5775,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5635,7 +5816,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5676,7 +5857,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5717,7 +5898,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5900,12 +6081,17 @@ static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *self, PyObject * wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bar", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWindow_SetRelatedStatusBar",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SetRelatedStatusBar",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRelatedStatusBar(arg2); @@ -6010,12 +6196,17 @@ static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *self, PyObject *args, PyO wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "b", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWindow_SetBorders",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SetBorders",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorders(arg2); @@ -6122,7 +6313,7 @@ static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6147,7 +6338,7 @@ static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6172,7 +6363,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6197,7 +6388,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6304,7 +6495,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6345,7 +6536,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6462,13 +6653,23 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *self, PyObject int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cell",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:HtmlWindow_base_OnCellMouseHover",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_base_OnCellMouseHover",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnCellMouseHover(arg2,arg3,arg4); @@ -6492,14 +6693,24 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *self, PyObject *a wxMouseEvent *arg5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cell",(char *) "x",(char *) "y",(char *) "event", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiiO:HtmlWindow_base_OnCellClicked",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:HtmlWindow_base_OnCellClicked",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg5 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -6578,13 +6789,18 @@ static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *self, PyObject *args, PyOb int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "maxwidth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:HtmlDCRenderer_SetDC",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlDCRenderer_SetDC",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlDCRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDC(arg2,arg3); @@ -6605,12 +6821,22 @@ static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *self, PyObject *args, Py int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:HtmlDCRenderer_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlDCRenderer_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlDCRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -6658,7 +6884,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6749,16 +6975,54 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO int arg8 = (int) 0 ; int result; 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 *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "to",(char *) "choices",(char *) "LCOUNT", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiiOi:HtmlDCRenderer_Render",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&obj6,&arg8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlDCRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_int,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->Render(arg2,arg3,arg4,arg5,arg6,arg7,arg8); @@ -6766,7 +7030,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6791,7 +7055,7 @@ static PyObject *_wrap_HtmlDCRenderer_GetTotalHeight(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6879,7 +7143,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args, } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6961,17 +7225,24 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, Py bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "header",(char *) "pg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlPrintout_SetHeader",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlPrintout_SetHeader",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeader((wxString const &)*arg2,arg3); @@ -7002,17 +7273,24 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, Py bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "footer",(char *) "pg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlPrintout_SetFooter",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlPrintout_SetFooter",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFooter((wxString const &)*arg2,arg3); @@ -7089,12 +7367,47 @@ static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *self, PyObject *args, P float arg5 = (float) 25.2 ; float arg6 = (float) 5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "top",(char *) "bottom",(char *) "left",(char *) "right",(char *) "spaces", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|fffff:HtmlPrintout_SetMargins",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:HtmlPrintout_SetMargins",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (float) SWIG_PyObj_AsFloat(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (float) SWIG_PyObj_AsFloat(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (float) SWIG_PyObj_AsFloat(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (float) SWIG_PyObj_AsFloat(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (float) SWIG_PyObj_AsFloat(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3,arg4,arg5,arg6); @@ -7485,17 +7798,24 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "header",(char *) "pg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlEasyPrinting_SetHeader",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlEasyPrinting_SetHeader",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlEasyPrinting,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeader((wxString const &)*arg2,arg3); @@ -7526,17 +7846,24 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "footer",(char *) "pg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlEasyPrinting_SetFooter",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlEasyPrinting_SetFooter",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlEasyPrinting,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFooter((wxString const &)*arg2,arg3); @@ -7877,12 +8204,22 @@ static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *self, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "end", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:HtmlBookRecord_SetContentsRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlBookRecord_SetContentsRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlBookRecord,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetContentsRange(arg2,arg3); @@ -7915,7 +8252,7 @@ static PyObject *_wrap_HtmlBookRecord_GetContentsStart(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7940,7 +8277,7 @@ static PyObject *_wrap_HtmlBookRecord_GetContentsEnd(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8139,7 +8476,7 @@ static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8164,7 +8501,7 @@ static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8283,7 +8620,7 @@ static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8308,7 +8645,7 @@ static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8333,7 +8670,7 @@ static PyObject *_wrap_HtmlSearchStatus_GetCurIndex(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8358,7 +8695,7 @@ static PyObject *_wrap_HtmlSearchStatus_GetMaxIndex(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8543,7 +8880,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8611,12 +8948,17 @@ static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *self, PyObject *args, int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlHelpData_FindPageById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpData_FindPageById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindPageById(arg2); @@ -8708,7 +9050,7 @@ static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8758,7 +9100,7 @@ static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8783,14 +9125,20 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec wxHtmlHelpFrame *result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent","arg2",(char *) "title",(char *) "style",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OiO:new_HtmlHelpFrame",kwnames,&obj0,&arg2,&obj2,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_HtmlHelpFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -8798,6 +9146,12 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec temp3 = True; } } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxHtmlHelpData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -8933,12 +9287,17 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *self, PyObject *args, P wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlHelpFrame_DisplayID",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpFrame_DisplayID",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Display(arg2); @@ -9027,7 +9386,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9173,11 +9532,18 @@ static PyObject *_wrap_new_HtmlHelpController(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 = (int) wxHF_DEFAULTSTYLE ; wxHtmlHelpController *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_HtmlHelpController",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_HtmlHelpController",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxHtmlHelpController *)new wxHtmlHelpController(arg1); @@ -9305,17 +9671,24 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "book",(char *) "show_wait_msg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlHelpController_AddBook",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlHelpController_AddBook",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpController,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AddBook((wxString const &)*arg2,arg3); @@ -9323,7 +9696,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9383,12 +9756,17 @@ static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *self, PyObject *ar wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlHelpController_DisplayID",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpController_DisplayID",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpController,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Display(arg2); @@ -9477,7 +9855,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -10860,16 +11238,17 @@ static swig_type_info _swigt__p_wxHtmlRenderingStyle[] = {{"_p_wxHtmlRenderingSt static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0},{"_p_wxMouseEvent"},{0}}; static swig_type_info _swigt__p_wxHtmlWordCell[] = {{"_p_wxHtmlWordCell", 0, "wxHtmlWordCell *", 0},{"_p_wxHtmlWordCell"},{0}}; static swig_type_info _swigt__p_wxHtmlHelpData[] = {{"_p_wxHtmlHelpData", 0, "wxHtmlHelpData *", 0},{"_p_wxHtmlHelpData"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxHtmlWinParser[] = {{"_p_wxHtmlWinParser", 0, "wxHtmlWinParser *", 0},{"_p_wxHtmlWinParser"},{0}}; static swig_type_info _swigt__p_wxHtmlParser[] = {{"_p_wxHtmlParser", 0, "wxHtmlParser *", 0},{"_p_wxHtmlParser"},{"_p_wxHtmlWinParser", _p_wxHtmlWinParserTo_p_wxHtmlParser},{0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_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_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; -static swig_type_info _swigt__p_wxHtmlFontCell[] = {{"_p_wxHtmlFontCell", 0, "wxHtmlFontCell *", 0},{"_p_wxHtmlFontCell"},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; static swig_type_info _swigt__p_wxHtmlColourCell[] = {{"_p_wxHtmlColourCell", 0, "wxHtmlColourCell *", 0},{"_p_wxHtmlColourCell"},{0}}; static swig_type_info _swigt__p_wxPyHtmlWindow[] = {{"_p_wxPyHtmlWindow", 0, "wxPyHtmlWindow *", 0},{"_p_wxPyHtmlWindow"},{0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxScrolledWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_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_wxTipWindow", _p_wxTipWindowTo_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_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_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_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, "wxTopLevelWindow *", 0},{"_p_wxFrame", _p_wxFrameTo_p_wxTopLevelWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxTopLevelWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxTopLevelWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxTopLevelWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxTopLevelWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxTopLevelWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxTopLevelWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxTopLevelWindow},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxTopLevelWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxTopLevelWindow},{"_p_wxTopLevelWindow"},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxTopLevelWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxTopLevelWindow},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxTopLevelWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxTopLevelWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxTopLevelWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxTopLevelWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxTopLevelWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxTopLevelWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxTopLevelWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxTopLevelWindow},{0}}; +static swig_type_info _swigt__p_wxHtmlFontCell[] = {{"_p_wxHtmlFontCell", 0, "wxHtmlFontCell *", 0},{"_p_wxHtmlFontCell"},{0}}; static swig_type_info _swigt__p_wxHtmlEasyPrinting[] = {{"_p_wxHtmlEasyPrinting", 0, "wxHtmlEasyPrinting *", 0},{"_p_wxHtmlEasyPrinting"},{0}}; static swig_type_info _swigt__p_wxHtmlSelection[] = {{"_p_wxHtmlSelection", 0, "wxHtmlSelection *", 0},{"_p_wxHtmlSelection"},{0}}; static swig_type_info _swigt__p_wxHtmlRenderingInfo[] = {{"_p_wxHtmlRenderingInfo", 0, "wxHtmlRenderingInfo *", 0},{"_p_wxHtmlRenderingInfo"},{0}}; @@ -10913,16 +11292,17 @@ _swigt__p_wxHtmlRenderingStyle, _swigt__p_wxMouseEvent, _swigt__p_wxHtmlWordCell, _swigt__p_wxHtmlHelpData, +_swigt__p_char, _swigt__p_wxHtmlWinParser, _swigt__p_wxHtmlParser, _swigt__p_wxPanel, -_swigt__p_wxHtmlFontCell, _swigt__p_wxFont, _swigt__p_wxHtmlColourCell, _swigt__p_wxPyHtmlWindow, _swigt__p_wxScrolledWindow, _swigt__p_wxWindow, _swigt__p_wxTopLevelWindow, +_swigt__p_wxHtmlFontCell, _swigt__p_wxHtmlEasyPrinting, _swigt__p_wxHtmlSelection, _swigt__p_wxHtmlRenderingInfo, @@ -10962,60 +11342,6 @@ _swigt__p_wxHtmlBookRecord, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"HTML_ALIGN_LEFT", (long) wxHTML_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_ALIGN_CENTER", (long) wxHTML_ALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_ALIGN_RIGHT", (long) wxHTML_ALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_ALIGN_BOTTOM", (long) wxHTML_ALIGN_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_ALIGN_TOP", (long) wxHTML_ALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_CLR_FOREGROUND", (long) wxHTML_CLR_FOREGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_CLR_BACKGROUND", (long) wxHTML_CLR_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_UNITS_PIXELS", (long) wxHTML_UNITS_PIXELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_UNITS_PERCENT", (long) wxHTML_UNITS_PERCENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_LEFT", (long) wxHTML_INDENT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_RIGHT", (long) wxHTML_INDENT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_TOP", (long) wxHTML_INDENT_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_BOTTOM", (long) wxHTML_INDENT_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_HORIZONTAL", (long) wxHTML_INDENT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_VERTICAL", (long) wxHTML_INDENT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_ALL", (long) wxHTML_INDENT_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_COND_ISANCHOR", (long) wxHTML_COND_ISANCHOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_COND_ISIMAGEMAP", (long) wxHTML_COND_ISIMAGEMAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_COND_USER", (long) wxHTML_COND_USER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_1", (long) wxHTML_FONT_SIZE_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_2", (long) wxHTML_FONT_SIZE_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_3", (long) wxHTML_FONT_SIZE_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_4", (long) wxHTML_FONT_SIZE_4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_5", (long) wxHTML_FONT_SIZE_5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_6", (long) wxHTML_FONT_SIZE_6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_7", (long) wxHTML_FONT_SIZE_7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HW_SCROLLBAR_NEVER", (long) wxHW_SCROLLBAR_NEVER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HW_SCROLLBAR_AUTO", (long) wxHW_SCROLLBAR_AUTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HW_NO_SELECTION", (long) wxHW_NO_SELECTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HW_DEFAULT_STYLE", (long) wxHW_DEFAULT_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_OPEN", (long) wxHTML_OPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_BLOCK", (long) wxHTML_BLOCK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_REDIRECT", (long) wxHTML_REDIRECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_URL_PAGE", (long) wxHTML_URL_PAGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_URL_IMAGE", (long) wxHTML_URL_IMAGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_URL_OTHER", (long) wxHTML_URL_OTHER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_SEL_OUT", (long) wxHTML_SEL_OUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_SEL_IN", (long) wxHTML_SEL_IN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_SEL_CHANGING", (long) wxHTML_SEL_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FIND_EXACT", (long) wxHTML_FIND_EXACT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FIND_NEAREST_BEFORE", (long) wxHTML_FIND_NEAREST_BEFORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FIND_NEAREST_AFTER", (long) wxHTML_FIND_NEAREST_AFTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAGE_ODD", (long) wxPAGE_ODD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAGE_EVEN", (long) wxPAGE_EVEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAGE_ALL", (long) wxPAGE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_TOOLBAR", (long) wxHF_TOOLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_FLATTOOLBAR", (long) wxHF_FLATTOOLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_CONTENTS", (long) wxHF_CONTENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_INDEX", (long) wxHF_INDEX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_SEARCH", (long) wxHF_SEARCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_BOOKMARKS", (long) wxHF_BOOKMARKS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_OPENFILES", (long) wxHF_OPENFILES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_PRINT", (long) wxHF_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_DEFAULTSTYLE", (long) wxHF_DEFAULTSTYLE, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -11046,6 +11372,60 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"HtmlWindowNameStr",_wrap_HtmlWindowNameStr_get, _wrap_HtmlWindowNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"HtmlPrintoutTitleStr",_wrap_HtmlPrintoutTitleStr_get, _wrap_HtmlPrintoutTitleStr_set); SWIG_addvarlink(SWIG_globals,(char*)"HtmlPrintingTitleStr",_wrap_HtmlPrintingTitleStr_get, _wrap_HtmlPrintingTitleStr_set); + PyDict_SetItemString(d,"HTML_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_LEFT)); + PyDict_SetItemString(d,"HTML_ALIGN_CENTER", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_CENTER)); + PyDict_SetItemString(d,"HTML_ALIGN_RIGHT", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_RIGHT)); + PyDict_SetItemString(d,"HTML_ALIGN_BOTTOM", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_BOTTOM)); + PyDict_SetItemString(d,"HTML_ALIGN_TOP", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_TOP)); + PyDict_SetItemString(d,"HTML_CLR_FOREGROUND", SWIG_PyObj_FromInt((int)wxHTML_CLR_FOREGROUND)); + PyDict_SetItemString(d,"HTML_CLR_BACKGROUND", SWIG_PyObj_FromInt((int)wxHTML_CLR_BACKGROUND)); + PyDict_SetItemString(d,"HTML_UNITS_PIXELS", SWIG_PyObj_FromInt((int)wxHTML_UNITS_PIXELS)); + PyDict_SetItemString(d,"HTML_UNITS_PERCENT", SWIG_PyObj_FromInt((int)wxHTML_UNITS_PERCENT)); + PyDict_SetItemString(d,"HTML_INDENT_LEFT", SWIG_PyObj_FromInt((int)wxHTML_INDENT_LEFT)); + PyDict_SetItemString(d,"HTML_INDENT_RIGHT", SWIG_PyObj_FromInt((int)wxHTML_INDENT_RIGHT)); + PyDict_SetItemString(d,"HTML_INDENT_TOP", SWIG_PyObj_FromInt((int)wxHTML_INDENT_TOP)); + PyDict_SetItemString(d,"HTML_INDENT_BOTTOM", SWIG_PyObj_FromInt((int)wxHTML_INDENT_BOTTOM)); + PyDict_SetItemString(d,"HTML_INDENT_HORIZONTAL", SWIG_PyObj_FromInt((int)wxHTML_INDENT_HORIZONTAL)); + PyDict_SetItemString(d,"HTML_INDENT_VERTICAL", SWIG_PyObj_FromInt((int)wxHTML_INDENT_VERTICAL)); + PyDict_SetItemString(d,"HTML_INDENT_ALL", SWIG_PyObj_FromInt((int)wxHTML_INDENT_ALL)); + PyDict_SetItemString(d,"HTML_COND_ISANCHOR", SWIG_PyObj_FromInt((int)wxHTML_COND_ISANCHOR)); + PyDict_SetItemString(d,"HTML_COND_ISIMAGEMAP", SWIG_PyObj_FromInt((int)wxHTML_COND_ISIMAGEMAP)); + PyDict_SetItemString(d,"HTML_COND_USER", SWIG_PyObj_FromInt((int)wxHTML_COND_USER)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_1", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_1)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_2", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_2)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_3", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_3)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_4", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_4)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_5", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_5)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_6", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_6)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_7", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_7)); + PyDict_SetItemString(d,"HW_SCROLLBAR_NEVER", SWIG_PyObj_FromInt((int)wxHW_SCROLLBAR_NEVER)); + PyDict_SetItemString(d,"HW_SCROLLBAR_AUTO", SWIG_PyObj_FromInt((int)wxHW_SCROLLBAR_AUTO)); + PyDict_SetItemString(d,"HW_NO_SELECTION", SWIG_PyObj_FromInt((int)wxHW_NO_SELECTION)); + PyDict_SetItemString(d,"HW_DEFAULT_STYLE", SWIG_PyObj_FromInt((int)wxHW_DEFAULT_STYLE)); + PyDict_SetItemString(d,"HTML_OPEN", SWIG_PyObj_FromInt((int)wxHTML_OPEN)); + PyDict_SetItemString(d,"HTML_BLOCK", SWIG_PyObj_FromInt((int)wxHTML_BLOCK)); + PyDict_SetItemString(d,"HTML_REDIRECT", SWIG_PyObj_FromInt((int)wxHTML_REDIRECT)); + PyDict_SetItemString(d,"HTML_URL_PAGE", SWIG_PyObj_FromInt((int)wxHTML_URL_PAGE)); + PyDict_SetItemString(d,"HTML_URL_IMAGE", SWIG_PyObj_FromInt((int)wxHTML_URL_IMAGE)); + PyDict_SetItemString(d,"HTML_URL_OTHER", SWIG_PyObj_FromInt((int)wxHTML_URL_OTHER)); + PyDict_SetItemString(d,"HTML_SEL_OUT", SWIG_PyObj_FromInt((int)wxHTML_SEL_OUT)); + PyDict_SetItemString(d,"HTML_SEL_IN", SWIG_PyObj_FromInt((int)wxHTML_SEL_IN)); + PyDict_SetItemString(d,"HTML_SEL_CHANGING", SWIG_PyObj_FromInt((int)wxHTML_SEL_CHANGING)); + PyDict_SetItemString(d,"HTML_FIND_EXACT", SWIG_PyObj_FromInt((int)wxHTML_FIND_EXACT)); + PyDict_SetItemString(d,"HTML_FIND_NEAREST_BEFORE", SWIG_PyObj_FromInt((int)wxHTML_FIND_NEAREST_BEFORE)); + PyDict_SetItemString(d,"HTML_FIND_NEAREST_AFTER", SWIG_PyObj_FromInt((int)wxHTML_FIND_NEAREST_AFTER)); + PyDict_SetItemString(d,"PAGE_ODD", SWIG_PyObj_FromInt((int)wxPAGE_ODD)); + PyDict_SetItemString(d,"PAGE_EVEN", SWIG_PyObj_FromInt((int)wxPAGE_EVEN)); + PyDict_SetItemString(d,"PAGE_ALL", SWIG_PyObj_FromInt((int)wxPAGE_ALL)); + PyDict_SetItemString(d,"HF_TOOLBAR", SWIG_PyObj_FromInt((int)wxHF_TOOLBAR)); + PyDict_SetItemString(d,"HF_FLATTOOLBAR", SWIG_PyObj_FromInt((int)wxHF_FLATTOOLBAR)); + PyDict_SetItemString(d,"HF_CONTENTS", SWIG_PyObj_FromInt((int)wxHF_CONTENTS)); + PyDict_SetItemString(d,"HF_INDEX", SWIG_PyObj_FromInt((int)wxHF_INDEX)); + PyDict_SetItemString(d,"HF_SEARCH", SWIG_PyObj_FromInt((int)wxHF_SEARCH)); + PyDict_SetItemString(d,"HF_BOOKMARKS", SWIG_PyObj_FromInt((int)wxHF_BOOKMARKS)); + PyDict_SetItemString(d,"HF_OPENFILES", SWIG_PyObj_FromInt((int)wxHF_OPENFILES)); + PyDict_SetItemString(d,"HF_PRINT", SWIG_PyObj_FromInt((int)wxHF_PRINT)); + PyDict_SetItemString(d,"HF_DEFAULTSTYLE", SWIG_PyObj_FromInt((int)wxHF_DEFAULTSTYLE)); wxPyPtrTypeMap_Add("wxHtmlTagHandler", "wxPyHtmlTagHandler"); wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler"); diff --git a/wxPython/src/mac/misc_wrap.cpp b/wxPython/src/mac/misc_wrap.cpp index 14743d083e..c194d5a0aa 100644 --- a/wxPython/src/mac/misc_wrap.cpp +++ b/wxPython/src/mac/misc_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -408,12 +257,12 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxLogTextCtrl swig_types[24] #define SWIGTYPE_p_wxTextCtrl swig_types[25] #define SWIGTYPE_p_wxBusyCursor swig_types[26] -#define SWIGTYPE_p_wxFileDataObject swig_types[27] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[28] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[29] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[30] -#define SWIGTYPE_p_wxTextDataObject swig_types[31] -#define SWIGTYPE_p_wxDataObject swig_types[32] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[27] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[28] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[29] +#define SWIGTYPE_p_wxTextDataObject swig_types[30] +#define SWIGTYPE_p_wxDataObject swig_types[31] +#define SWIGTYPE_p_wxFileDataObject swig_types[32] #define SWIGTYPE_p_wxCustomDataObject swig_types[33] #define SWIGTYPE_p_wxURLDataObject swig_types[34] #define SWIGTYPE_p_wxMetafileDataObject swig_types[35] @@ -430,41 +279,42 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxDataObjectSimple swig_types[46] #define SWIGTYPE_p_wxEvtHandler swig_types[47] #define SWIGTYPE_p_wxRect swig_types[48] -#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[49] -#define SWIGTYPE_p_wxFileTypeInfo swig_types[50] -#define SWIGTYPE_p_wxFrame swig_types[51] -#define SWIGTYPE_p_wxTimer swig_types[52] -#define SWIGTYPE_p_wxMimeTypesManager swig_types[53] -#define SWIGTYPE_p_wxPyArtProvider swig_types[54] -#define SWIGTYPE_p_wxPyTipProvider swig_types[55] -#define SWIGTYPE_p_wxTipProvider swig_types[56] -#define SWIGTYPE_p_wxJoystick swig_types[57] -#define SWIGTYPE_p_wxSystemOptions swig_types[58] -#define SWIGTYPE_p_wxPoint swig_types[59] -#define SWIGTYPE_p_wxJoystickEvent swig_types[60] -#define SWIGTYPE_p_wxCursor swig_types[61] -#define SWIGTYPE_p_wxObject swig_types[62] -#define SWIGTYPE_p_wxOutputStream swig_types[63] -#define SWIGTYPE_p_wxDateTime swig_types[64] -#define SWIGTYPE_p_wxPyDropSource swig_types[65] -#define SWIGTYPE_p_wxWindow swig_types[66] -#define SWIGTYPE_p_wxString swig_types[67] -#define SWIGTYPE_p_wxPyProcess swig_types[68] -#define SWIGTYPE_p_wxBitmap swig_types[69] -#define SWIGTYPE_p_wxConfig swig_types[70] -#define SWIGTYPE_p_wxChar swig_types[71] -#define SWIGTYPE_p_wxBusyInfo swig_types[72] -#define SWIGTYPE_p_wxPyDropTarget swig_types[73] -#define SWIGTYPE_p_wxPyTextDropTarget swig_types[74] -#define SWIGTYPE_p_wxPyFileDropTarget swig_types[75] -#define SWIGTYPE_p_wxProcessEvent swig_types[76] -#define SWIGTYPE_p_wxPyLog swig_types[77] -#define SWIGTYPE_p_wxLogNull swig_types[78] -#define SWIGTYPE_p_wxColour swig_types[79] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[80] -#define SWIGTYPE_p_wxPyTimer swig_types[81] -#define SWIGTYPE_p_wxDateSpan swig_types[82] -static swig_type_info *swig_types[84]; +#define SWIGTYPE_p_char swig_types[49] +#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[50] +#define SWIGTYPE_p_wxFileTypeInfo swig_types[51] +#define SWIGTYPE_p_wxFrame swig_types[52] +#define SWIGTYPE_p_wxTimer swig_types[53] +#define SWIGTYPE_p_wxMimeTypesManager swig_types[54] +#define SWIGTYPE_p_wxPyArtProvider swig_types[55] +#define SWIGTYPE_p_wxPyTipProvider swig_types[56] +#define SWIGTYPE_p_wxTipProvider swig_types[57] +#define SWIGTYPE_p_wxJoystick swig_types[58] +#define SWIGTYPE_p_wxSystemOptions swig_types[59] +#define SWIGTYPE_p_wxPoint swig_types[60] +#define SWIGTYPE_p_wxJoystickEvent swig_types[61] +#define SWIGTYPE_p_wxCursor swig_types[62] +#define SWIGTYPE_p_wxObject swig_types[63] +#define SWIGTYPE_p_wxOutputStream swig_types[64] +#define SWIGTYPE_p_wxDateTime swig_types[65] +#define SWIGTYPE_p_wxPyDropSource swig_types[66] +#define SWIGTYPE_p_wxWindow swig_types[67] +#define SWIGTYPE_p_wxString swig_types[68] +#define SWIGTYPE_p_wxPyProcess swig_types[69] +#define SWIGTYPE_p_wxBitmap swig_types[70] +#define SWIGTYPE_p_wxConfig swig_types[71] +#define SWIGTYPE_p_wxChar swig_types[72] +#define SWIGTYPE_p_wxBusyInfo swig_types[73] +#define SWIGTYPE_p_wxPyDropTarget swig_types[74] +#define SWIGTYPE_p_wxPyTextDropTarget swig_types[75] +#define SWIGTYPE_p_wxPyFileDropTarget swig_types[76] +#define SWIGTYPE_p_wxProcessEvent swig_types[77] +#define SWIGTYPE_p_wxPyLog swig_types[78] +#define SWIGTYPE_p_wxLogNull swig_types[79] +#define SWIGTYPE_p_wxColour swig_types[80] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[81] +#define SWIGTYPE_p_wxPyTimer swig_types[82] +#define SWIGTYPE_p_wxDateSpan swig_types[83] +static swig_type_info *swig_types[85]; /* -------- TYPES TABLE (END) -------- */ @@ -476,6 +326,44 @@ static swig_type_info *swig_types[84]; #define SWIG_name "_misc" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/pyistream.h" @@ -484,10 +372,41 @@ static swig_type_info *swig_types[84]; static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -515,6 +434,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + bool wxThread_IsMain() { #ifdef WXP_WITH_THREAD return wxThread::IsMain(); @@ -637,6 +564,14 @@ IMP_PYCALLBACK_STRING_STRING(wxPyTipProvider, wxTipProvider, PreprocessTip); IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify); + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + wxString Log_TimeStamp(){ wxString msg; wxLog::TimeStamp(&msg); @@ -998,6 +933,22 @@ long wxConfigBase_ReadInt(wxConfigBase *self,wxString const &key,long defaultVal self->Read(key, &rv, defaultVal); return rv; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + double wxConfigBase_ReadFloat(wxConfigBase *self,wxString const &key,double defaultVal){ double rv; self->Read(key, &rv, defaultVal); @@ -1017,6 +968,9 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa #define LOCAL_TZ wxDateTime::Local + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + wxDateTime wxDateTime___add____SWIG_0(wxDateTime *self,wxTimeSpan const &other){ return *self + other; } wxDateTime wxDateTime___add____SWIG_1(wxDateTime *self,wxDateSpan const &other){ return *self + other; } wxTimeSpan wxDateTime___sub____SWIG_0(wxDateTime *self,wxDateTime const &other){ return *self - other; } @@ -1295,11 +1249,16 @@ static PyObject *_wrap_SystemSettings_GetColour(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 ; wxColour result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_GetColour",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetColour",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemColour) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxSystemSettings::GetColour((wxSystemColour )arg1); @@ -1322,11 +1281,16 @@ static PyObject *_wrap_SystemSettings_GetFont(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 ; wxFont result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_GetFont",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetFont",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemFont) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxSystemSettings::GetFont((wxSystemFont )arg1); @@ -1349,11 +1313,16 @@ static PyObject *_wrap_SystemSettings_GetMetric(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_GetMetric",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetMetric",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemMetric) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxSystemSettings::GetMetric((wxSystemMetric )arg1); @@ -1361,7 +1330,7 @@ static PyObject *_wrap_SystemSettings_GetMetric(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1372,11 +1341,16 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_HasFeature",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_HasFeature",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemFeature) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxSystemSettings::HasFeature((wxSystemFeature )arg1); @@ -1384,7 +1358,7 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1406,7 +1380,7 @@ static PyObject *_wrap_SystemSettings_GetScreenType(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1416,11 +1390,16 @@ static PyObject *_wrap_SystemSettings_GetScreenType(PyObject *self, PyObject *ar static PyObject *_wrap_SystemSettings_SetScreenType(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "screen", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_SetScreenType",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_SetScreenType",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemScreenType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSystemSettings::SetScreenType((wxSystemScreenType )arg1); @@ -1523,16 +1502,21 @@ static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args int arg2 ; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "name",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SystemOptions_SetOptionInt",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SystemOptions_SetOptionInt",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSystemOptions::SetOption((wxString const &)*arg1,arg2); @@ -1622,7 +1606,7 @@ static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp1) delete arg1; @@ -1660,7 +1644,7 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -1682,7 +1666,7 @@ static PyObject * SystemOptions_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_FileSelectorPromptStr_set(PyObject *_val) { +static int _wrap_FileSelectorPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only."); return 1; } @@ -1702,7 +1686,7 @@ static PyObject *_wrap_FileSelectorPromptStr_get() { } -static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) { +static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only."); return 1; } @@ -1722,7 +1706,7 @@ static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() { } -static int _wrap_DirSelectorPromptStr_set(PyObject *_val) { +static int _wrap_DirSelectorPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only."); return 1; } @@ -1757,7 +1741,7 @@ static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -1767,11 +1751,16 @@ static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:RegisterId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegisterId",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxRegisterId(arg1); @@ -1801,7 +1790,7 @@ static PyObject *_wrap_GetCurrentId(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -1862,7 +1851,7 @@ static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:GetElapsedTime",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -1873,7 +1862,7 @@ static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -1930,7 +1919,7 @@ static PyObject *_wrap_IsBusy(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1991,7 +1980,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -2048,7 +2037,7 @@ static PyObject *_wrap_GetOsVersion(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { PyObject *o = PyInt_FromLong((long) (*arg1)); resultobj = t_output_helper(resultobj,o); @@ -2106,7 +2095,7 @@ static PyObject *_wrap_GetFreeMemory(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -2117,11 +2106,16 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "wFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Shutdown",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Shutdown",kwnames,&obj0)) goto fail; + { + arg1 = (wxShutdownFlags) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxShutdown((wxShutdownFlags )arg1); @@ -2129,7 +2123,7 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2139,11 +2133,16 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs static PyObject *_wrap_Sleep(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "secs", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Sleep",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sleep",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSleep(arg1); @@ -2168,7 +2167,7 @@ static PyObject *_wrap_Usleep(PyObject *self, PyObject *args, PyObject *kwargs) if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Usleep",kwnames,&obj0)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -2195,7 +2194,7 @@ static PyObject *_wrap_EnableTopLevelWindows(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EnableTopLevelWindows",kwnames,&obj0)) goto fail; { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -2486,7 +2485,7 @@ static PyObject *_wrap_GetProcessId(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -2541,12 +2540,15 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "message",(char *) "default_path",(char *) "default_filename",(char *) "default_extension",(char *) "wildcard",(char *) "flags",(char *) "parent",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOiOii:FileSelector",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&arg8,&arg9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOOOOO:FileSelector",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -2582,9 +2584,27 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw temp5 = True; } } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxFileSelector((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9); @@ -2829,13 +2849,14 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa wxPoint temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "message",(char *) "defaultPath",(char *) "style",(char *) "pos",(char *) "parent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOlOO:DirSelector",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:DirSelector",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -2850,6 +2871,12 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa temp2 = True; } } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -2914,12 +2941,14 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "message",(char *) "caption",(char *) "default_value",(char *) "parent",(char *) "x",(char *) "y",(char *) "centre", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOiiO:GetTextFromUser",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:GetTextFromUser",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -2942,9 +2971,21 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -3098,12 +3139,16 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "message",(char *) "caption",(char *) "choices",(char *) "parent",(char *) "x",(char *) "y",(char *) "centre",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OiiOii:GetSingleChoice",kwnames,&obj0,&obj1,&obj2,&obj3,&arg6,&arg7,&obj6,&arg9,&arg10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:GetSingleChoice",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3122,9 +3167,33 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg8 = (bool) SPyObj_AsBool(obj6); + arg8 = (bool) SWIG_PyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg10 = (int) SWIG_PyObj_AsInt(obj8); if (PyErr_Occurred()) SWIG_fail; } } @@ -3189,12 +3258,16 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "message",(char *) "caption",(char *) "choices",(char *) "parent",(char *) "x",(char *) "y",(char *) "centre",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OiiOii:GetSingleChoiceIndex",kwnames,&obj0,&obj1,&obj2,&obj3,&arg6,&arg7,&obj6,&arg9,&arg10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:GetSingleChoiceIndex",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3213,9 +3286,33 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg8 = (bool) SPyObj_AsBool(obj6); + arg8 = (bool) SWIG_PyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg10 = (int) SWIG_PyObj_AsInt(obj8); if (PyErr_Occurred()) SWIG_fail; } } @@ -3226,7 +3323,7 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp1) delete arg1; @@ -3269,12 +3366,15 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "message",(char *) "caption",(char *) "style",(char *) "parent",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OiOii:MessageBox",kwnames,&obj0,&obj1,&arg3,&obj3,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:MessageBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3287,9 +3387,27 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar temp2 = True; } } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxMessageBox((wxString const &)*arg1,(wxString const &)*arg2,arg3,arg4,arg5,arg6); @@ -3297,7 +3415,7 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp1) delete arg1; @@ -3339,13 +3457,16 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj6 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "message",(char *) "prompt",(char *) "caption",(char *) "value",(char *) "min",(char *) "max",(char *) "parent",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOl|llOO:GetNumberFromUser",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:GetNumberFromUser",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3361,6 +3482,22 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec if (arg3 == NULL) SWIG_fail; temp3 = True; } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -3377,7 +3514,7 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp1) delete arg1; @@ -3423,7 +3560,7 @@ static PyObject *_wrap_ColourDisplay(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3445,7 +3582,7 @@ static PyObject *_wrap_DisplayDepth(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3467,7 +3604,7 @@ static PyObject *_wrap_GetDisplayDepth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3841,11 +3978,16 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "key", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetKeyState",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetKeyState",kwnames,&obj0)) goto fail; + { + arg1 = (wxKeyCode) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxGetKeyState((wxKeyCode )arg1); @@ -3853,7 +3995,7 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3991,7 +4133,7 @@ static PyObject *_wrap_Thread_IsMain(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4146,7 +4288,7 @@ static PyObject *_wrap_ToolTip_Enable(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ToolTip_Enable",kwnames,&obj0)) goto fail; { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -4166,11 +4308,16 @@ static PyObject *_wrap_ToolTip_Enable(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_ToolTip_SetDelay(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "milliseconds", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:ToolTip_SetDelay",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ToolTip_SetDelay",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxToolTip::SetDelay(arg1); @@ -4266,7 +4413,7 @@ static PyObject *_wrap_Caret_IsOk(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4291,7 +4438,7 @@ static PyObject *_wrap_Caret_IsVisible(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4465,12 +4612,22 @@ static PyObject *_wrap_Caret_MoveXY(PyObject *self, PyObject *args, PyObject *kw int arg2 ; int 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 *)"Oii:Caret_MoveXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Caret_MoveXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Move(arg2,arg3); @@ -4522,12 +4679,22 @@ static PyObject *_wrap_Caret_SetSizeWH(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Caret_SetSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Caret_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -4578,12 +4745,19 @@ static PyObject *_wrap_Caret_Show(PyObject *self, PyObject *args, PyObject *kwar wxCaret *arg1 = (wxCaret *) 0 ; int arg2 = (int) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "show", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Caret_Show",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Caret_Show",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Show(arg2); @@ -4644,7 +4818,7 @@ static PyObject *_wrap_Caret_GetBlinkTime(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4654,11 +4828,16 @@ static PyObject *_wrap_Caret_GetBlinkTime(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Caret_SetBlinkTime(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "milliseconds", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Caret_SetBlinkTime",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_SetBlinkTime",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxCaret_SetBlinkTime(arg1); @@ -4885,12 +5064,19 @@ static PyObject *_wrap_StopWatch_Start(PyObject *self, PyObject *args, PyObject wxStopWatch *arg1 = (wxStopWatch *) 0 ; long arg2 = (long) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "t0", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:StopWatch_Start",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StopWatch_Start",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStopWatch,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Start(arg2); @@ -4971,7 +5157,7 @@ static PyObject *_wrap_StopWatch_Time(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4989,11 +5175,18 @@ static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 = (int) 9 ; wxFileHistory *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "maxFiles", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_FileHistory",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FileHistory",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFileHistory *)new wxFileHistory(arg1); @@ -5077,12 +5270,17 @@ static PyObject *_wrap_FileHistory_RemoveFileFromHistory(PyObject *self, PyObjec wxFileHistory *arg1 = (wxFileHistory *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FileHistory_RemoveFileFromHistory",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileHistory_RemoveFileFromHistory",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileHistory,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveFileFromHistory(arg2); @@ -5115,7 +5313,7 @@ static PyObject *_wrap_FileHistory_GetMaxFiles(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5293,12 +5491,17 @@ static PyObject *_wrap_FileHistory_GetHistoryFile(PyObject *self, PyObject *args int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FileHistory_GetHistoryFile",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileHistory_GetHistoryFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileHistory,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxFileHistory const *)arg1)->GetHistoryFile(arg2); @@ -5337,7 +5540,7 @@ static PyObject *_wrap_FileHistory_GetCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5491,7 +5694,7 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5532,7 +5735,7 @@ static PyObject *_wrap_SingleInstanceChecker_IsAnotherRunning(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5553,16 +5756,21 @@ static PyObject *_wrap_DrawWindowOnDC(PyObject *self, PyObject *args, PyObject * int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "window",(char *) "dc",(char *) "method", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:DrawWindowOnDC",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DrawWindowOnDC",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxDrawWindowOnDC(arg1,(wxDC const &)*arg2,arg3); @@ -5650,7 +5858,7 @@ static PyObject *_wrap_TipProvider_GetCurrentTip(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -5722,7 +5930,7 @@ static PyObject *_wrap_new_PyTipProvider(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PyTipProvider",kwnames,&obj0)) goto fail; { - arg1 = (size_t) SPyObj_AsUnsignedLong(obj0); + arg1 = (size_t) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -5794,7 +6002,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTipProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5805,7 +6013,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5831,7 +6039,7 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO temp1 = True; } { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -5862,14 +6070,21 @@ static PyObject *_wrap_new_Timer(PyObject *self, PyObject *args, PyObject *kwarg int arg2 = (int) -1 ; wxPyTimer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "owner",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_Timer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Timer",kwnames,&obj0,&obj1)) goto fail; if (obj0) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyTimer *)new wxPyTimer(arg1,arg2); @@ -5945,13 +6160,20 @@ static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject * int arg3 = (int) -1 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "owner",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Timer_SetOwner",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Timer_SetOwner",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOwner(arg2,arg3); @@ -5973,16 +6195,23 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa bool arg3 = (bool) False ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "milliseconds",(char *) "oneShot", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Timer_Start",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Timer_Start",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5993,7 +6222,7 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6042,7 +6271,7 @@ static PyObject *_wrap_Timer_IsRunning(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6067,7 +6296,7 @@ static PyObject *_wrap_Timer_GetInterval(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6092,7 +6321,7 @@ static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6117,7 +6346,7 @@ static PyObject *_wrap_Timer_GetId(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6136,11 +6365,25 @@ static PyObject *_wrap_new_TimerEvent(PyObject *self, PyObject *args, PyObject * int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxTimerEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "timerid",(char *) "interval", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_TimerEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TimerEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTimerEvent *)new wxTimerEvent(arg1,arg2); @@ -6173,7 +6416,7 @@ static PyObject *_wrap_TimerEvent_GetInterval(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6219,16 +6462,21 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *self, PyObject *args) { bool arg3 = (bool) False ; wxTimerRunner *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi|O:new_TimerRunner",&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_TimerRunner",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6283,7 +6531,7 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -6296,7 +6544,7 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { return _wrap_new_TimerRunner__SWIG_1(self,args); } { - SPyObj_AsBool(argv[2]); + SWIG_PyObj_AsBool(argv[2]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -6346,16 +6594,21 @@ static PyObject *_wrap_TimerRunner_Start(PyObject *self, PyObject *args, PyObjec int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "milli",(char *) "oneShot", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:TimerRunner_Start",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TimerRunner_Start",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimerRunner,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6417,7 +6670,7 @@ static PyObject *_wrap_Log_IsEnabled(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6436,7 +6689,7 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Log_EnableLogging",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -6447,7 +6700,7 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6468,12 +6721,12 @@ static PyObject *_wrap_Log_OnLog(PyObject *self, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Log_OnLog",kwnames,&obj0,&obj1,&obj2)) goto fail; { - arg1 = (wxLogLevel) SPyObj_AsUnsignedLong(obj0); + arg1 = (wxLogLevel) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxChar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (time_t) SPyObj_AsUnsignedInt(obj2); + arg3 = (time_t) SWIG_PyObj_AsUnsignedInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6635,7 +6888,7 @@ static PyObject *_wrap_Log_SetVerbose(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Log_SetVerbose",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -6663,7 +6916,7 @@ static PyObject *_wrap_Log_SetLogLevel(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetLogLevel",kwnames,&obj0)) goto fail; { - arg1 = (wxLogLevel) SPyObj_AsUnsignedLong(obj0); + arg1 = (wxLogLevel) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -6711,7 +6964,7 @@ static PyObject *_wrap_Log_SetTraceMask(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetTraceMask",kwnames,&obj0)) goto fail; { - arg1 = (wxTraceMask) SPyObj_AsUnsignedLong(obj0); + arg1 = (wxTraceMask) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -6889,7 +7142,7 @@ static PyObject *_wrap_Log_GetVerbose(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6911,7 +7164,7 @@ static PyObject *_wrap_Log_GetTraceMask(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -6936,7 +7189,7 @@ static PyObject *_wrap_Log_IsAllowedTraceMask(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6958,7 +7211,7 @@ static PyObject *_wrap_Log_GetLogLevel(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -7161,13 +7414,13 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7207,7 +7460,7 @@ static PyObject *_wrap_LogWindow_Show(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -7295,7 +7548,7 @@ static PyObject *_wrap_LogWindow_IsPassingMessages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7315,7 +7568,7 @@ static PyObject *_wrap_LogWindow_PassMessages(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogWindow_PassMessages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -7404,7 +7657,7 @@ static PyObject *_wrap_LogChain_PassMessages(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogChain_PassMessages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogChain,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -7439,7 +7692,7 @@ static PyObject *_wrap_LogChain_IsPassingMessages(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7493,7 +7746,7 @@ static PyObject *_wrap_SysErrorCode(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -7512,7 +7765,7 @@ static PyObject *_wrap_SysErrorMsg(PyObject *self, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:SysErrorMsg",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -7919,7 +8172,7 @@ static PyObject *_wrap_LogTrace__SWIG_0(PyObject *self, PyObject *args) { if(!PyArg_ParseTuple(args,(char *)"OO:LogTrace",&obj0,&obj1)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -8037,7 +8290,7 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) { if (argc == 2) { int _v; { - SPyObj_AsUnsignedLong(argv[0]); + SWIG_PyObj_AsUnsignedLong(argv[0]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -8079,7 +8332,7 @@ static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -8279,11 +8532,23 @@ static PyObject *_wrap_Process_Kill(PyObject *self, PyObject *args, PyObject *kw int arg1 ; int arg2 = (int) wxSIGTERM ; int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "pid",(char *) "sig", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:Process_Kill",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Process_Kill",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxSignal) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxPyProcess::Kill(arg1,(wxSignal )arg2); @@ -8291,7 +8556,7 @@ static PyObject *_wrap_Process_Kill(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8302,11 +8567,16 @@ static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "pid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Process_Exists",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Process_Exists",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxPyProcess::Exists(arg1); @@ -8314,7 +8584,7 @@ static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8328,16 +8598,23 @@ static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kw wxPyProcess *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "cmd",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Process_Open",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Process_Open",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyProcess *)wxPyProcess::Open((wxString const &)*arg1,arg2); @@ -8366,14 +8643,21 @@ static PyObject *_wrap_new_Process(PyObject *self, PyObject *args, PyObject *kwa int arg2 = (int) -1 ; wxPyProcess *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_Process",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Process",kwnames,&obj0,&obj1)) goto fail; if (obj0) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyProcess *)new wxPyProcess(arg1,arg2); @@ -8424,12 +8708,22 @@ static PyObject *_wrap_Process_base_OnTerminate(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pid",(char *) "status", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Process_base_OnTerminate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Process_base_OnTerminate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyProcess,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnTerminate(arg2,arg3); @@ -8486,7 +8780,7 @@ static PyObject *_wrap_Process_IsRedirected(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8648,7 +8942,7 @@ static PyObject *_wrap_Process_IsInputOpened(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8673,7 +8967,7 @@ static PyObject *_wrap_Process_IsInputAvailable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8698,7 +8992,7 @@ static PyObject *_wrap_Process_IsErrorAvailable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8718,11 +9012,32 @@ static PyObject *_wrap_new_ProcessEvent(PyObject *self, PyObject *args, PyObject int arg2 = (int) 0 ; int arg3 = (int) 0 ; wxProcessEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "id",(char *) "pid",(char *) "exitcode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iii:new_ProcessEvent",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ProcessEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxProcessEvent *)new wxProcessEvent(arg1,arg2,arg3); @@ -8755,7 +9070,7 @@ static PyObject *_wrap_ProcessEvent_GetPid(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8780,7 +9095,7 @@ static PyObject *_wrap_ProcessEvent_GetExitCode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8792,12 +9107,17 @@ static PyObject *_wrap_ProcessEvent_m_pid_set(PyObject *self, PyObject *args, Py wxProcessEvent *arg1 = (wxProcessEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_pid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ProcessEvent_m_pid_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ProcessEvent_m_pid_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProcessEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_pid = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -8820,7 +9140,7 @@ static PyObject *_wrap_ProcessEvent_m_pid_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProcessEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_pid); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8832,12 +9152,17 @@ static PyObject *_wrap_ProcessEvent_m_exitcode_set(PyObject *self, PyObject *arg wxProcessEvent *arg1 = (wxProcessEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_exitcode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ProcessEvent_m_exitcode_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ProcessEvent_m_exitcode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProcessEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_exitcode = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -8860,7 +9185,7 @@ static PyObject *_wrap_ProcessEvent_m_exitcode_get(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProcessEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_exitcode); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8882,17 +9207,24 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs) long result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "command",(char *) "flags",(char *) "process", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Execute",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Execute",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyProcess,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -8903,7 +9235,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp1) delete arg1; @@ -8922,11 +9254,18 @@ static PyObject *_wrap_new_Joystick(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; int arg1 = (int) wxJOYSTICK1 ; wxJoystick *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "joystick", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_Joystick",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Joystick",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxJoystick *)new wxJoystick(arg1); @@ -9012,7 +9351,7 @@ static PyObject *_wrap_Joystick_GetZPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9037,7 +9376,7 @@ static PyObject *_wrap_Joystick_GetButtonState(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9062,7 +9401,7 @@ static PyObject *_wrap_Joystick_GetPOVPosition(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9087,7 +9426,7 @@ static PyObject *_wrap_Joystick_GetPOVCTSPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9112,7 +9451,7 @@ static PyObject *_wrap_Joystick_GetRudderPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9137,7 +9476,7 @@ static PyObject *_wrap_Joystick_GetUPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9162,7 +9501,7 @@ static PyObject *_wrap_Joystick_GetVPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9187,7 +9526,7 @@ static PyObject *_wrap_Joystick_GetMovementThreshold(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9199,12 +9538,17 @@ static PyObject *_wrap_Joystick_SetMovementThreshold(PyObject *self, PyObject *a wxJoystick *arg1 = (wxJoystick *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "threshold", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Joystick_SetMovementThreshold",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Joystick_SetMovementThreshold",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystick,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMovementThreshold(arg2); @@ -9237,7 +9581,7 @@ static PyObject *_wrap_Joystick_IsOk(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9262,7 +9606,7 @@ static PyObject *_wrap_Joystick_GetNumberJoysticks(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9287,7 +9631,7 @@ static PyObject *_wrap_Joystick_GetManufacturerId(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9312,7 +9656,7 @@ static PyObject *_wrap_Joystick_GetProductId(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9368,7 +9712,7 @@ static PyObject *_wrap_Joystick_GetXMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9393,7 +9737,7 @@ static PyObject *_wrap_Joystick_GetYMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9418,7 +9762,7 @@ static PyObject *_wrap_Joystick_GetZMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9443,7 +9787,7 @@ static PyObject *_wrap_Joystick_GetXMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9468,7 +9812,7 @@ static PyObject *_wrap_Joystick_GetYMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9493,7 +9837,7 @@ static PyObject *_wrap_Joystick_GetZMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9518,7 +9862,7 @@ static PyObject *_wrap_Joystick_GetNumberButtons(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9543,7 +9887,7 @@ static PyObject *_wrap_Joystick_GetNumberAxes(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9568,7 +9912,7 @@ static PyObject *_wrap_Joystick_GetMaxButtons(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9593,7 +9937,7 @@ static PyObject *_wrap_Joystick_GetMaxAxes(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9618,7 +9962,7 @@ static PyObject *_wrap_Joystick_GetPollingMin(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9643,7 +9987,7 @@ static PyObject *_wrap_Joystick_GetPollingMax(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9668,7 +10012,7 @@ static PyObject *_wrap_Joystick_GetRudderMin(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9693,7 +10037,7 @@ static PyObject *_wrap_Joystick_GetRudderMax(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9718,7 +10062,7 @@ static PyObject *_wrap_Joystick_GetUMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9743,7 +10087,7 @@ static PyObject *_wrap_Joystick_GetUMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9768,7 +10112,7 @@ static PyObject *_wrap_Joystick_GetVMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9793,7 +10137,7 @@ static PyObject *_wrap_Joystick_GetVMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9818,7 +10162,7 @@ static PyObject *_wrap_Joystick_HasRudder(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9843,7 +10187,7 @@ static PyObject *_wrap_Joystick_HasZ(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9868,7 +10212,7 @@ static PyObject *_wrap_Joystick_HasU(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9893,7 +10237,7 @@ static PyObject *_wrap_Joystick_HasV(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9918,7 +10262,7 @@ static PyObject *_wrap_Joystick_HasPOV(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9943,7 +10287,7 @@ static PyObject *_wrap_Joystick_HasPOV4Dir(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9968,7 +10312,7 @@ static PyObject *_wrap_Joystick_HasPOVCTS(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9983,13 +10327,20 @@ static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObj bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "win",(char *) "pollingFreq", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Joystick_SetCapture",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Joystick_SetCapture",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystick,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetCapture(arg2,arg3); @@ -9997,7 +10348,7 @@ static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10022,7 +10373,7 @@ static PyObject *_wrap_Joystick_ReleaseCapture(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10083,12 +10434,17 @@ static PyObject *_wrap_JoystickEvent_m_zPosition_set(PyObject *self, PyObject *a wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_zPosition", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_m_zPosition_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_zPosition_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_zPosition = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -10111,7 +10467,7 @@ static PyObject *_wrap_JoystickEvent_m_zPosition_get(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_zPosition); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10123,12 +10479,17 @@ static PyObject *_wrap_JoystickEvent_m_buttonChange_set(PyObject *self, PyObject wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_buttonChange", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_m_buttonChange_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_buttonChange_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_buttonChange = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -10151,7 +10512,7 @@ static PyObject *_wrap_JoystickEvent_m_buttonChange_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_buttonChange); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10163,12 +10524,17 @@ static PyObject *_wrap_JoystickEvent_m_buttonState_set(PyObject *self, PyObject wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_buttonState", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_m_buttonState_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_buttonState_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_buttonState = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -10191,7 +10557,7 @@ static PyObject *_wrap_JoystickEvent_m_buttonState_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_buttonState); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10203,12 +10569,17 @@ static PyObject *_wrap_JoystickEvent_m_joyStick_set(PyObject *self, PyObject *ar wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_joyStick", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_m_joyStick_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_joyStick_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_joyStick = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -10231,7 +10602,7 @@ static PyObject *_wrap_JoystickEvent_m_joyStick_get(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_joyStick); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10245,11 +10616,39 @@ static PyObject *_wrap_new_JoystickEvent(PyObject *self, PyObject *args, PyObjec int arg3 = (int) wxJOYSTICK1 ; int arg4 = (int) 0 ; wxJoystickEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "type",(char *) "state",(char *) "joystick",(char *) "change", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_JoystickEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_JoystickEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxJoystickEvent *)new wxJoystickEvent(arg1,arg2,arg3,arg4); @@ -10311,7 +10710,7 @@ static PyObject *_wrap_JoystickEvent_GetZPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10336,7 +10735,7 @@ static PyObject *_wrap_JoystickEvent_GetButtonState(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10361,7 +10760,7 @@ static PyObject *_wrap_JoystickEvent_GetButtonChange(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10386,7 +10785,7 @@ static PyObject *_wrap_JoystickEvent_GetJoystick(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10398,12 +10797,17 @@ static PyObject *_wrap_JoystickEvent_SetJoystick(PyObject *self, PyObject *args, wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stick", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_SetJoystick",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetJoystick",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetJoystick(arg2); @@ -10423,12 +10827,17 @@ static PyObject *_wrap_JoystickEvent_SetButtonState(PyObject *self, PyObject *ar wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_SetButtonState",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetButtonState",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetButtonState(arg2); @@ -10448,12 +10857,17 @@ static PyObject *_wrap_JoystickEvent_SetButtonChange(PyObject *self, PyObject *a wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "change", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_SetButtonChange",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetButtonChange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetButtonChange(arg2); @@ -10504,12 +10918,17 @@ static PyObject *_wrap_JoystickEvent_SetZPosition(PyObject *self, PyObject *args wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "zPos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_SetZPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetZPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetZPosition(arg2); @@ -10542,7 +10961,7 @@ static PyObject *_wrap_JoystickEvent_IsButton(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10567,7 +10986,7 @@ static PyObject *_wrap_JoystickEvent_IsMove(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10592,7 +11011,7 @@ static PyObject *_wrap_JoystickEvent_IsZMove(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10605,12 +11024,19 @@ static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args, int arg2 = (int) wxJOY_BUTTON_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:JoystickEvent_ButtonDown",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:JoystickEvent_ButtonDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxJoystickEvent const *)arg1)->ButtonDown(arg2); @@ -10618,7 +11044,7 @@ static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10631,12 +11057,19 @@ static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, Py int arg2 = (int) wxJOY_BUTTON_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:JoystickEvent_ButtonUp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:JoystickEvent_ButtonUp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxJoystickEvent const *)arg1)->ButtonUp(arg2); @@ -10644,7 +11077,7 @@ static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10657,12 +11090,19 @@ static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args int arg2 = (int) wxJOY_BUTTON_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:JoystickEvent_ButtonIsDown",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:JoystickEvent_ButtonIsDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxJoystickEvent const *)arg1)->ButtonIsDown(arg2); @@ -10670,7 +11110,7 @@ static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10704,7 +11144,7 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -10810,7 +11250,7 @@ static PyObject *_wrap_Wave_IsOk(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10834,13 +11274,13 @@ static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwarg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10851,7 +11291,7 @@ static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11040,7 +11480,7 @@ static PyObject *_wrap_FileTypeInfo_IsValid(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11055,17 +11495,24 @@ static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "iconFile",(char *) "iconIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FileTypeInfo_SetIcon",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileTypeInfo_SetIcon",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileTypeInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetIcon((wxString const &)*arg2,arg3); @@ -11346,7 +11793,7 @@ static PyObject *_wrap_FileTypeInfo_GetExtensionsCount(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11405,7 +11852,7 @@ static PyObject *_wrap_FileTypeInfo_GetIconIndex(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11832,7 +12279,7 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -11843,7 +12290,7 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -11876,11 +12323,12 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cmd",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|Oi:FileType_SetDefaultIcon",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:FileType_SetDefaultIcon",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileType,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { @@ -11889,6 +12337,12 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P temp2 = True; } } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetDefaultIcon((wxString const &)*arg2,arg3); @@ -11896,7 +12350,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -11929,7 +12383,7 @@ static PyObject *_wrap_FileType_Unassociate(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12022,7 +12476,7 @@ static PyObject * FileType_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TheMimeTypesManager_set(PyObject *_val) { +static int _wrap_TheMimeTypesManager_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheMimeTypesManager is read-only."); return 1; } @@ -12067,7 +12521,7 @@ static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -12120,13 +12574,20 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg wxString *arg3 = (wxString *) &arg3_defvalue ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mailcapStyle",(char *) "extraDir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:MimeTypesManager_Initialize",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:MimeTypesManager_Initialize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMimeTypesManager,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -12285,7 +12746,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -12296,7 +12757,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -12337,7 +12798,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -12459,7 +12920,7 @@ static PyObject *_wrap_MimeTypesManager_Unassociate(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12497,7 +12958,7 @@ static PyObject * MimeTypesManager_swigregister(PyObject *self, PyObject *args) Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ART_TOOLBAR_set(PyObject *_val) { +static int _wrap_ART_TOOLBAR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_TOOLBAR is read-only."); return 1; } @@ -12517,7 +12978,7 @@ static PyObject *_wrap_ART_TOOLBAR_get() { } -static int _wrap_ART_MENU_set(PyObject *_val) { +static int _wrap_ART_MENU_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_MENU is read-only."); return 1; } @@ -12537,7 +12998,7 @@ static PyObject *_wrap_ART_MENU_get() { } -static int _wrap_ART_FRAME_ICON_set(PyObject *_val) { +static int _wrap_ART_FRAME_ICON_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_FRAME_ICON is read-only."); return 1; } @@ -12557,7 +13018,7 @@ static PyObject *_wrap_ART_FRAME_ICON_get() { } -static int _wrap_ART_CMN_DIALOG_set(PyObject *_val) { +static int _wrap_ART_CMN_DIALOG_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_CMN_DIALOG is read-only."); return 1; } @@ -12577,7 +13038,7 @@ static PyObject *_wrap_ART_CMN_DIALOG_get() { } -static int _wrap_ART_HELP_BROWSER_set(PyObject *_val) { +static int _wrap_ART_HELP_BROWSER_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_BROWSER is read-only."); return 1; } @@ -12597,7 +13058,7 @@ static PyObject *_wrap_ART_HELP_BROWSER_get() { } -static int _wrap_ART_MESSAGE_BOX_set(PyObject *_val) { +static int _wrap_ART_MESSAGE_BOX_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_MESSAGE_BOX is read-only."); return 1; } @@ -12617,7 +13078,7 @@ static PyObject *_wrap_ART_MESSAGE_BOX_get() { } -static int _wrap_ART_OTHER_set(PyObject *_val) { +static int _wrap_ART_OTHER_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_OTHER is read-only."); return 1; } @@ -12637,7 +13098,7 @@ static PyObject *_wrap_ART_OTHER_get() { } -static int _wrap_ART_ADD_BOOKMARK_set(PyObject *_val) { +static int _wrap_ART_ADD_BOOKMARK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_ADD_BOOKMARK is read-only."); return 1; } @@ -12657,7 +13118,7 @@ static PyObject *_wrap_ART_ADD_BOOKMARK_get() { } -static int _wrap_ART_DEL_BOOKMARK_set(PyObject *_val) { +static int _wrap_ART_DEL_BOOKMARK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_DEL_BOOKMARK is read-only."); return 1; } @@ -12677,7 +13138,7 @@ static PyObject *_wrap_ART_DEL_BOOKMARK_get() { } -static int _wrap_ART_HELP_SIDE_PANEL_set(PyObject *_val) { +static int _wrap_ART_HELP_SIDE_PANEL_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_SIDE_PANEL is read-only."); return 1; } @@ -12697,7 +13158,7 @@ static PyObject *_wrap_ART_HELP_SIDE_PANEL_get() { } -static int _wrap_ART_HELP_SETTINGS_set(PyObject *_val) { +static int _wrap_ART_HELP_SETTINGS_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_SETTINGS is read-only."); return 1; } @@ -12717,7 +13178,7 @@ static PyObject *_wrap_ART_HELP_SETTINGS_get() { } -static int _wrap_ART_HELP_BOOK_set(PyObject *_val) { +static int _wrap_ART_HELP_BOOK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_BOOK is read-only."); return 1; } @@ -12737,7 +13198,7 @@ static PyObject *_wrap_ART_HELP_BOOK_get() { } -static int _wrap_ART_HELP_FOLDER_set(PyObject *_val) { +static int _wrap_ART_HELP_FOLDER_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_FOLDER is read-only."); return 1; } @@ -12757,7 +13218,7 @@ static PyObject *_wrap_ART_HELP_FOLDER_get() { } -static int _wrap_ART_HELP_PAGE_set(PyObject *_val) { +static int _wrap_ART_HELP_PAGE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_PAGE is read-only."); return 1; } @@ -12777,7 +13238,7 @@ static PyObject *_wrap_ART_HELP_PAGE_get() { } -static int _wrap_ART_GO_BACK_set(PyObject *_val) { +static int _wrap_ART_GO_BACK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_BACK is read-only."); return 1; } @@ -12797,7 +13258,7 @@ static PyObject *_wrap_ART_GO_BACK_get() { } -static int _wrap_ART_GO_FORWARD_set(PyObject *_val) { +static int _wrap_ART_GO_FORWARD_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_FORWARD is read-only."); return 1; } @@ -12817,7 +13278,7 @@ static PyObject *_wrap_ART_GO_FORWARD_get() { } -static int _wrap_ART_GO_UP_set(PyObject *_val) { +static int _wrap_ART_GO_UP_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_UP is read-only."); return 1; } @@ -12837,7 +13298,7 @@ static PyObject *_wrap_ART_GO_UP_get() { } -static int _wrap_ART_GO_DOWN_set(PyObject *_val) { +static int _wrap_ART_GO_DOWN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DOWN is read-only."); return 1; } @@ -12857,7 +13318,7 @@ static PyObject *_wrap_ART_GO_DOWN_get() { } -static int _wrap_ART_GO_TO_PARENT_set(PyObject *_val) { +static int _wrap_ART_GO_TO_PARENT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_TO_PARENT is read-only."); return 1; } @@ -12877,7 +13338,7 @@ static PyObject *_wrap_ART_GO_TO_PARENT_get() { } -static int _wrap_ART_GO_HOME_set(PyObject *_val) { +static int _wrap_ART_GO_HOME_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_HOME is read-only."); return 1; } @@ -12897,7 +13358,7 @@ static PyObject *_wrap_ART_GO_HOME_get() { } -static int _wrap_ART_FILE_OPEN_set(PyObject *_val) { +static int _wrap_ART_FILE_OPEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_FILE_OPEN is read-only."); return 1; } @@ -12917,7 +13378,7 @@ static PyObject *_wrap_ART_FILE_OPEN_get() { } -static int _wrap_ART_PRINT_set(PyObject *_val) { +static int _wrap_ART_PRINT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_PRINT is read-only."); return 1; } @@ -12937,7 +13398,7 @@ static PyObject *_wrap_ART_PRINT_get() { } -static int _wrap_ART_HELP_set(PyObject *_val) { +static int _wrap_ART_HELP_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP is read-only."); return 1; } @@ -12957,7 +13418,7 @@ static PyObject *_wrap_ART_HELP_get() { } -static int _wrap_ART_TIP_set(PyObject *_val) { +static int _wrap_ART_TIP_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_TIP is read-only."); return 1; } @@ -12977,7 +13438,7 @@ static PyObject *_wrap_ART_TIP_get() { } -static int _wrap_ART_REPORT_VIEW_set(PyObject *_val) { +static int _wrap_ART_REPORT_VIEW_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_REPORT_VIEW is read-only."); return 1; } @@ -12997,7 +13458,7 @@ static PyObject *_wrap_ART_REPORT_VIEW_get() { } -static int _wrap_ART_LIST_VIEW_set(PyObject *_val) { +static int _wrap_ART_LIST_VIEW_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_LIST_VIEW is read-only."); return 1; } @@ -13017,7 +13478,7 @@ static PyObject *_wrap_ART_LIST_VIEW_get() { } -static int _wrap_ART_NEW_DIR_set(PyObject *_val) { +static int _wrap_ART_NEW_DIR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_NEW_DIR is read-only."); return 1; } @@ -13037,7 +13498,7 @@ static PyObject *_wrap_ART_NEW_DIR_get() { } -static int _wrap_ART_FOLDER_set(PyObject *_val) { +static int _wrap_ART_FOLDER_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER is read-only."); return 1; } @@ -13057,7 +13518,7 @@ static PyObject *_wrap_ART_FOLDER_get() { } -static int _wrap_ART_GO_DIR_UP_set(PyObject *_val) { +static int _wrap_ART_GO_DIR_UP_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DIR_UP is read-only."); return 1; } @@ -13077,7 +13538,7 @@ static PyObject *_wrap_ART_GO_DIR_UP_get() { } -static int _wrap_ART_EXECUTABLE_FILE_set(PyObject *_val) { +static int _wrap_ART_EXECUTABLE_FILE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_EXECUTABLE_FILE is read-only."); return 1; } @@ -13097,7 +13558,7 @@ static PyObject *_wrap_ART_EXECUTABLE_FILE_get() { } -static int _wrap_ART_NORMAL_FILE_set(PyObject *_val) { +static int _wrap_ART_NORMAL_FILE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_NORMAL_FILE is read-only."); return 1; } @@ -13117,7 +13578,7 @@ static PyObject *_wrap_ART_NORMAL_FILE_get() { } -static int _wrap_ART_TICK_MARK_set(PyObject *_val) { +static int _wrap_ART_TICK_MARK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_TICK_MARK is read-only."); return 1; } @@ -13137,7 +13598,7 @@ static PyObject *_wrap_ART_TICK_MARK_get() { } -static int _wrap_ART_CROSS_MARK_set(PyObject *_val) { +static int _wrap_ART_CROSS_MARK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_CROSS_MARK is read-only."); return 1; } @@ -13157,7 +13618,7 @@ static PyObject *_wrap_ART_CROSS_MARK_get() { } -static int _wrap_ART_ERROR_set(PyObject *_val) { +static int _wrap_ART_ERROR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_ERROR is read-only."); return 1; } @@ -13177,7 +13638,7 @@ static PyObject *_wrap_ART_ERROR_get() { } -static int _wrap_ART_QUESTION_set(PyObject *_val) { +static int _wrap_ART_QUESTION_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_QUESTION is read-only."); return 1; } @@ -13197,7 +13658,7 @@ static PyObject *_wrap_ART_QUESTION_get() { } -static int _wrap_ART_WARNING_set(PyObject *_val) { +static int _wrap_ART_WARNING_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_WARNING is read-only."); return 1; } @@ -13217,7 +13678,7 @@ static PyObject *_wrap_ART_WARNING_get() { } -static int _wrap_ART_INFORMATION_set(PyObject *_val) { +static int _wrap_ART_INFORMATION_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_INFORMATION is read-only."); return 1; } @@ -13237,7 +13698,7 @@ static PyObject *_wrap_ART_INFORMATION_get() { } -static int _wrap_ART_MISSING_IMAGE_set(PyObject *_val) { +static int _wrap_ART_MISSING_IMAGE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_MISSING_IMAGE is read-only."); return 1; } @@ -13348,7 +13809,7 @@ static PyObject *_wrap_ArtProvider_PopProvider(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13373,7 +13834,7 @@ static PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13614,7 +14075,7 @@ static PyObject *_wrap_ConfigBase_Get(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ConfigBase_Get",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -13780,12 +14241,17 @@ static PyObject *_wrap_ConfigBase_GetNextGroup(PyObject *self, PyObject *args, P long arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ConfigBase_GetNextGroup",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_GetNextGroup",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxConfigBase_GetNextGroup(arg1,arg2); @@ -13831,12 +14297,17 @@ static PyObject *_wrap_ConfigBase_GetNextEntry(PyObject *self, PyObject *args, P long arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ConfigBase_GetNextEntry",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_GetNextEntry",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxConfigBase_GetNextEntry(arg1,arg2); @@ -13866,7 +14337,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -13877,7 +14348,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -13899,7 +14370,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -13910,7 +14381,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -13943,7 +14414,7 @@ static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -13984,7 +14455,7 @@ static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14025,7 +14496,7 @@ static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14066,7 +14537,7 @@ static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -14156,17 +14627,24 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "key",(char *) "defaultVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:ConfigBase_ReadInt",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ConfigBase_ReadInt",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)wxConfigBase_ReadInt(arg1,(wxString const &)*arg2,arg3); @@ -14174,7 +14652,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp2) delete arg2; @@ -14198,17 +14676,24 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "key",(char *) "defaultVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|d:ConfigBase_ReadFloat",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ConfigBase_ReadFloat",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)wxConfigBase_ReadFloat(arg1,(wxString const &)*arg2,arg3); @@ -14216,7 +14701,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); { if (temp2) delete arg2; @@ -14254,7 +14739,7 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -14265,7 +14750,7 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14314,7 +14799,7 @@ static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14346,17 +14831,22 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "key",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:ConfigBase_WriteInt",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ConfigBase_WriteInt",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Write((wxString const &)*arg2,arg3); @@ -14364,7 +14854,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14388,17 +14878,22 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "key",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:ConfigBase_WriteFloat",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ConfigBase_WriteFloat",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Write((wxString const &)*arg2,arg3); @@ -14406,7 +14901,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14443,7 +14938,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb temp2 = True; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14453,7 +14948,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14483,7 +14978,7 @@ static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -14494,7 +14989,7 @@ static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14535,7 +15030,7 @@ static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14592,7 +15087,7 @@ static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14638,7 +15133,7 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -14649,7 +15144,7 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14690,7 +15185,7 @@ static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14723,7 +15218,7 @@ static PyObject *_wrap_ConfigBase_DeleteAll(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14748,7 +15243,7 @@ static PyObject *_wrap_ConfigBase_IsExpandingEnvVars(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14769,7 +15264,7 @@ static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -14801,7 +15296,7 @@ static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -14837,7 +15332,7 @@ static PyObject *_wrap_ConfigBase_IsRecordingDefaults(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15038,12 +15533,17 @@ static PyObject *_wrap_ConfigBase_SetStyle(PyObject *self, PyObject *args, PyObj wxConfigBase *arg1 = (wxConfigBase *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ConfigBase_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -15076,7 +15576,7 @@ static PyObject *_wrap_ConfigBase_GetStyle(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -15216,11 +15716,12 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "appName",(char *) "vendorName",(char *) "localFilename",(char *) "globalFilename",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOl:new_Config",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:new_Config",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -15249,6 +15750,12 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar temp4 = True; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxConfig *)new wxConfig((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,arg5); @@ -15346,11 +15853,12 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject * PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "appName",(char *) "vendorName",(char *) "localFilename",(char *) "globalFilename",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOl:new_FileConfig",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:new_FileConfig",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -15379,6 +15887,12 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject * temp4 = True; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFileConfig *)new wxFileConfig((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,arg5); @@ -15500,7 +16014,7 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k } -static int _wrap_DateFormatStr_set(PyObject *_val) { +static int _wrap_DateFormatStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DateFormatStr is read-only."); return 1; } @@ -15520,7 +16034,7 @@ static PyObject *_wrap_DateFormatStr_get() { } -static int _wrap_TimeSpanFormatStr_set(PyObject *_val) { +static int _wrap_TimeSpanFormatStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TimeSpanFormatStr is read-only."); return 1; } @@ -15543,11 +16057,16 @@ static PyObject *_wrap_TimeSpanFormatStr_get() { static PyObject *_wrap_DateTime_SetCountry(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateTime_SetCountry",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateTime_SetCountry",kwnames,&obj0)) goto fail; + { + arg1 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxDateTime::SetCountry((wxDateTime::Country )arg1); @@ -15577,7 +16096,7 @@ static PyObject *_wrap_DateTime_GetCountry(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15588,11 +16107,18 @@ static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *self, PyObject * PyObject *resultobj; int arg1 = (int) wxDateTime::Country_Default ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:DateTime_IsWestEuropeanCountry",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_IsWestEuropeanCountry",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxDateTime::IsWestEuropeanCountry((wxDateTime::Country )arg1); @@ -15600,7 +16126,7 @@ static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15611,11 +16137,18 @@ static PyObject *_wrap_DateTime_GetCurrentYear(PyObject *self, PyObject *args, P PyObject *resultobj; int arg1 = (int) wxDateTime::Gregorian ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:DateTime_GetCurrentYear",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCurrentYear",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetCurrentYear((wxDateTime::Calendar )arg1); @@ -15623,7 +16156,7 @@ static PyObject *_wrap_DateTime_GetCurrentYear(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15634,11 +16167,16 @@ static PyObject *_wrap_DateTime_ConvertYearToBC(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateTime_ConvertYearToBC",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateTime_ConvertYearToBC",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::ConvertYearToBC(arg1); @@ -15646,7 +16184,7 @@ static PyObject *_wrap_DateTime_ConvertYearToBC(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15657,11 +16195,18 @@ static PyObject *_wrap_DateTime_GetCurrentMonth(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 = (int) wxDateTime::Gregorian ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:DateTime_GetCurrentMonth",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCurrentMonth",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetCurrentMonth((wxDateTime::Calendar )arg1); @@ -15669,7 +16214,7 @@ static PyObject *_wrap_DateTime_GetCurrentMonth(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15681,11 +16226,25 @@ static PyObject *_wrap_DateTime_IsLeapYear(PyObject *self, PyObject *args, PyObj int arg1 = (int) wxDateTime::Inv_Year ; int arg2 = (int) wxDateTime::Gregorian ; bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:DateTime_IsLeapYear",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_IsLeapYear",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxDateTime::IsLeapYear(arg1,(wxDateTime::Calendar )arg2); @@ -15693,7 +16252,7 @@ static PyObject *_wrap_DateTime_IsLeapYear(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15704,11 +16263,18 @@ static PyObject *_wrap_DateTime_GetCentury(PyObject *self, PyObject *args, PyObj PyObject *resultobj; int arg1 = (int) wxDateTime::Inv_Year ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:DateTime_GetCentury",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCentury",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetCentury(arg1); @@ -15716,7 +16282,7 @@ static PyObject *_wrap_DateTime_GetCentury(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15728,11 +16294,23 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject * int arg1 ; int arg2 = (int) wxDateTime::Gregorian ; int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:DateTime_GetNumberOfDaysinYear",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetNumberOfDaysinYear",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetNumberOfDays(arg1,(wxDateTime::Calendar )arg2); @@ -15740,7 +16318,7 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15753,11 +16331,30 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject int arg2 = (int) wxDateTime::Inv_Year ; int arg3 = (int) wxDateTime::Gregorian ; int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "month",(char *) "year",(char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|ii:DateTime_GetNumberOfDaysInMonth",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetNumberOfDaysInMonth",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetNumberOfDays((wxDateTime::Month )arg1,arg2,(wxDateTime::Calendar )arg3); @@ -15765,7 +16362,7 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15777,11 +16374,23 @@ static PyObject *_wrap_DateTime_GetMonthName(PyObject *self, PyObject *args, PyO int arg1 ; int arg2 = (int) wxDateTime::Name_Full ; wxString result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "month",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:DateTime_GetMonthName",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetMonthName",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxDateTime::NameFlags) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateTime::GetMonthName((wxDateTime::Month )arg1,(wxDateTime::NameFlags )arg2); @@ -15807,11 +16416,23 @@ static PyObject *_wrap_DateTime_GetWeekDayName(PyObject *self, PyObject *args, P int arg1 ; int arg2 = (int) wxDateTime::Name_Full ; wxString result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:DateTime_GetWeekDayName",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetWeekDayName",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxDateTime::NameFlags) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateTime::GetWeekDayName((wxDateTime::WeekDay )arg1,(wxDateTime::NameFlags )arg2); @@ -15890,11 +16511,25 @@ static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *self, PyObject *args, int arg1 = (int) wxDateTime::Inv_Year ; int arg2 = (int) wxDateTime::Country_Default ; bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:DateTime_IsDSTApplicable",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_IsDSTApplicable",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxDateTime::IsDSTApplicable(arg1,(wxDateTime::Country )arg2); @@ -15902,7 +16537,7 @@ static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15914,11 +16549,25 @@ static PyObject *_wrap_DateTime_GetBeginDST(PyObject *self, PyObject *args, PyOb int arg1 = (int) wxDateTime::Inv_Year ; int arg2 = (int) wxDateTime::Country_Default ; wxDateTime result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:DateTime_GetBeginDST",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_GetBeginDST",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateTime::GetBeginDST(arg1,(wxDateTime::Country )arg2); @@ -15942,11 +16591,25 @@ static PyObject *_wrap_DateTime_GetEndDST(PyObject *self, PyObject *args, PyObje int arg1 = (int) wxDateTime::Inv_Year ; int arg2 = (int) wxDateTime::Country_Default ; wxDateTime result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:DateTime_GetEndDST",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_GetEndDST",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateTime::GetEndDST(arg1,(wxDateTime::Country )arg2); @@ -16076,7 +16739,7 @@ static PyObject *_wrap_new_DateTimeFromTimeT(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DateTimeFromTimeT",kwnames,&obj0)) goto fail; { - arg1 = (time_t) SPyObj_AsUnsignedInt(obj0); + arg1 = (time_t) SWIG_PyObj_AsUnsignedInt(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -16097,11 +16760,16 @@ static PyObject *_wrap_new_DateTimeFromJDN(PyObject *self, PyObject *args, PyObj PyObject *resultobj; double arg1 ; wxDateTime *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "jdn", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"d:new_DateTimeFromJDN",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DateTimeFromJDN",kwnames,&obj0)) goto fail; + { + arg1 = (double) SWIG_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1); @@ -16123,11 +16791,37 @@ static PyObject *_wrap_new_DateTimeFromHMS(PyObject *self, PyObject *args, PyObj int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxDateTime *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|iii:new_DateTimeFromHMS",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DateTimeFromHMS",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1,arg2,arg3,arg4); @@ -16152,11 +16846,58 @@ static PyObject *_wrap_new_DateTimeFromDMY(PyObject *self, PyObject *args, PyObj int arg6 = (int) 0 ; int arg7 = (int) 0 ; wxDateTime *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 *) "day",(char *) "month",(char *) "year",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|iiiiii:new_DateTimeFromDMY",kwnames,&arg1,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_DateTimeFromDMY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1,(wxDateTime::Month )arg2,arg3,arg4,arg5,arg6,arg7); @@ -16237,7 +16978,7 @@ static PyObject *_wrap_DateTime_SetTimeT(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetTimeT",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (time_t) SPyObj_AsUnsignedInt(obj1); + arg2 = (time_t) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16263,12 +17004,17 @@ static PyObject *_wrap_DateTime_SetJDN(PyObject *self, PyObject *args, PyObject double arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "jdn", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:DateTime_SetJDN",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetJDN",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16295,12 +17041,38 @@ static PyObject *_wrap_DateTime_SetHMS(PyObject *self, PyObject *args, PyObject int arg5 = (int) 0 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iii:DateTime_SetHMS",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DateTime_SetHMS",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16330,12 +17102,59 @@ static PyObject *_wrap_DateTime_Set(PyObject *self, PyObject *args, PyObject *kw int arg8 = (int) 0 ; wxDateTime *result; 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 *) "day",(char *) "month",(char *) "year",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iiiiii:DateTime_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:DateTime_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16387,12 +17206,17 @@ static PyObject *_wrap_DateTime_SetYear(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetYear",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetYear",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16416,12 +17240,17 @@ static PyObject *_wrap_DateTime_SetMonth(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "month", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetMonth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMonth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16445,12 +17274,17 @@ static PyObject *_wrap_DateTime_SetDay(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "day", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16474,12 +17308,17 @@ static PyObject *_wrap_DateTime_SetHour(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetHour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetHour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16503,12 +17342,17 @@ static PyObject *_wrap_DateTime_SetMinute(PyObject *self, PyObject *args, PyObje int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minute", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetMinute",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMinute",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16532,12 +17376,17 @@ static PyObject *_wrap_DateTime_SetSecond(PyObject *self, PyObject *args, PyObje int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "second", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetSecond",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetSecond",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16561,12 +17410,17 @@ static PyObject *_wrap_DateTime_SetMillisecond(PyObject *self, PyObject *args, P int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "millisecond", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetMillisecond",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMillisecond",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16591,12 +17445,24 @@ static PyObject *_wrap_DateTime_SetToWeekDayInSameWeek(PyObject *self, PyObject int arg3 = (int) wxDateTime::Monday_First ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:DateTime_SetToWeekDayInSameWeek",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DateTime_SetToWeekDayInSameWeek",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16621,12 +17487,24 @@ static PyObject *_wrap_DateTime_GetWeekDayInSameWeek(PyObject *self, PyObject *a int arg3 = (int) wxDateTime::Monday_First ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:DateTime_GetWeekDayInSameWeek",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DateTime_GetWeekDayInSameWeek",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetWeekDayInSameWeek((wxDateTime::WeekDay )arg2,(wxDateTime::WeekFlags )arg3); @@ -16651,12 +17529,17 @@ static PyObject *_wrap_DateTime_SetToNextWeekDay(PyObject *self, PyObject *args, int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetToNextWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToNextWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16680,12 +17563,17 @@ static PyObject *_wrap_DateTime_GetNextWeekDay(PyObject *self, PyObject *args, P int arg2 ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_GetNextWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetNextWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetNextWeekDay((wxDateTime::WeekDay )arg2); @@ -16710,12 +17598,17 @@ static PyObject *_wrap_DateTime_SetToPrevWeekDay(PyObject *self, PyObject *args, int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetToPrevWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToPrevWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16739,12 +17632,17 @@ static PyObject *_wrap_DateTime_GetPrevWeekDay(PyObject *self, PyObject *args, P int arg2 ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_GetPrevWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetPrevWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPrevWeekDay((wxDateTime::WeekDay )arg2); @@ -16772,12 +17670,38 @@ static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *self, PyObject *args, PyO int arg5 = (int) wxDateTime::Inv_Year ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "n",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iii:DateTime_SetToWeekDay",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DateTime_SetToWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetToWeekDay((wxDateTime::WeekDay )arg2,arg3,(wxDateTime::Month )arg4,arg5); @@ -16785,7 +17709,7 @@ static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16800,12 +17724,31 @@ static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *self, PyObject *args, int arg4 = (int) wxDateTime::Inv_Year ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_SetToLastWeekDay",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_SetToLastWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetToLastWeekDay((wxDateTime::WeekDay )arg2,(wxDateTime::Month )arg3,arg4); @@ -16813,7 +17756,7 @@ static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16828,12 +17771,31 @@ static PyObject *_wrap_DateTime_GetLastWeekDay(PyObject *self, PyObject *args, P int arg4 = (int) wxDateTime::Inv_Year ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_GetLastWeekDay",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_GetLastWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetLastWeekDay((wxDateTime::WeekDay )arg2,(wxDateTime::Month )arg3,arg4); @@ -16860,12 +17822,31 @@ static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyO int arg4 = (int) wxDateTime::Monday_First ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numWeek",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_SetToTheWeek",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_SetToTheWeek",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetToTheWeek(arg2,(wxDateTime::WeekDay )arg3,(wxDateTime::WeekFlags )arg4); @@ -16873,7 +17854,7 @@ static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16888,12 +17869,31 @@ static PyObject *_wrap_DateTime_GetWeek(PyObject *self, PyObject *args, PyObject int arg4 = (int) wxDateTime::Monday_First ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numWeek",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_GetWeek",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_GetWeek",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetWeek(arg2,(wxDateTime::WeekDay )arg3,(wxDateTime::WeekFlags )arg4); @@ -16919,12 +17919,26 @@ static PyObject *_wrap_DateTime_SetToLastMonthDay(PyObject *self, PyObject *args int arg3 = (int) wxDateTime::Inv_Year ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:DateTime_SetToLastMonthDay",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_SetToLastMonthDay",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16949,12 +17963,26 @@ static PyObject *_wrap_DateTime_GetLastMonthDay(PyObject *self, PyObject *args, int arg3 = (int) wxDateTime::Inv_Year ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:DateTime_GetLastMonthDay",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetLastMonthDay",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetLastMonthDay((wxDateTime::Month )arg2,arg3); @@ -16979,12 +18007,17 @@ static PyObject *_wrap_DateTime_SetToYearDay(PyObject *self, PyObject *args, PyO int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "yday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetToYearDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToYearDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -17008,12 +18041,17 @@ static PyObject *_wrap_DateTime_GetYearDay(PyObject *self, PyObject *args, PyObj int arg2 ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "yday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_GetYearDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetYearDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetYearDay(arg2); @@ -17050,7 +18088,7 @@ static PyObject *_wrap_DateTime_GetJulianDayNumber(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17075,7 +18113,7 @@ static PyObject *_wrap_DateTime_GetJDN(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17100,7 +18138,7 @@ static PyObject *_wrap_DateTime_GetModifiedJulianDayNumber(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17125,7 +18163,7 @@ static PyObject *_wrap_DateTime_GetMJD(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17150,7 +18188,7 @@ static PyObject *_wrap_DateTime_GetRataDie(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17179,7 +18217,7 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -17229,7 +18267,7 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -17271,7 +18309,7 @@ static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -17308,7 +18346,7 @@ static PyObject *_wrap_DateTime_MakeGMT(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -17335,12 +18373,19 @@ static PyObject *_wrap_DateTime_IsDST(PyObject *self, PyObject *args, PyObject * int arg2 = (int) wxDateTime::Country_Default ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DateTime_IsDST",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_IsDST",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->IsDST((wxDateTime::Country )arg2); @@ -17348,7 +18393,7 @@ static PyObject *_wrap_DateTime_IsDST(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17373,7 +18418,7 @@ static PyObject *_wrap_DateTime_IsValid(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17398,7 +18443,7 @@ static PyObject *_wrap_DateTime_GetTicks(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -17433,7 +18478,7 @@ static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17474,7 +18519,7 @@ static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17515,7 +18560,7 @@ static PyObject *_wrap_DateTime_GetDay(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17556,7 +18601,7 @@ static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17597,7 +18642,7 @@ static PyObject *_wrap_DateTime_GetHour(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17638,7 +18683,7 @@ static PyObject *_wrap_DateTime_GetMinute(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17679,7 +18724,7 @@ static PyObject *_wrap_DateTime_GetSecond(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17720,7 +18765,7 @@ static PyObject *_wrap_DateTime_GetMillisecond(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17761,7 +18806,7 @@ static PyObject *_wrap_DateTime_GetDayOfYear(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17783,13 +18828,20 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py int result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags",(char *) "tz", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:DateTime_GetWeekOfYear",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetWeekOfYear",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj2)); @@ -17803,7 +18855,7 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp3) delete arg3; } @@ -17825,13 +18877,20 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P int result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags",(char *) "tz", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:DateTime_GetWeekOfMonth",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetWeekOfMonth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj2)); @@ -17845,7 +18904,7 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp3) delete arg3; } @@ -17864,12 +18923,19 @@ static PyObject *_wrap_DateTime_IsWorkDay(PyObject *self, PyObject *args, PyObje int arg2 = (int) wxDateTime::Country_Default ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DateTime_IsWorkDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_IsWorkDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxDateTime const *)arg1)->IsWorkDay((wxDateTime::Country )arg2); @@ -17877,7 +18943,7 @@ static PyObject *_wrap_DateTime_IsWorkDay(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17908,7 +18974,7 @@ static PyObject *_wrap_DateTime_IsEqualTo(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17939,7 +19005,7 @@ static PyObject *_wrap_DateTime_IsEarlierThan(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17970,7 +19036,7 @@ static PyObject *_wrap_DateTime_IsLaterThan(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18007,7 +19073,7 @@ static PyObject *_wrap_DateTime_IsStrictlyBetween(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18044,7 +19110,7 @@ static PyObject *_wrap_DateTime_IsBetween(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18075,7 +19141,7 @@ static PyObject *_wrap_DateTime_IsSameDate(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18106,7 +19172,7 @@ static PyObject *_wrap_DateTime_IsSameTime(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18143,7 +19209,7 @@ static PyObject *_wrap_DateTime_IsEqualUpTo(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18920,7 +19986,7 @@ static PyObject *_wrap_DateTime___lt__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18948,7 +20014,7 @@ static PyObject *_wrap_DateTime___le__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18976,7 +20042,7 @@ static PyObject *_wrap_DateTime___gt__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19004,7 +20070,7 @@ static PyObject *_wrap_DateTime___ge__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19032,7 +20098,7 @@ static PyObject *_wrap_DateTime___eq__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19060,7 +20126,7 @@ static PyObject *_wrap_DateTime___ne__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19093,7 +20159,7 @@ static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19154,7 +20220,7 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19203,7 +20269,7 @@ static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19244,7 +20310,7 @@ static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19285,7 +20351,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19501,11 +20567,16 @@ static PyObject *_wrap_TimeSpan_Seconds(PyObject *self, PyObject *args, PyObject PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "sec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Seconds",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Seconds",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Seconds(arg1); @@ -19554,11 +20625,16 @@ static PyObject *_wrap_TimeSpan_Minutes(PyObject *self, PyObject *args, PyObject PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Minutes",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Minutes",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Minutes(arg1); @@ -19607,11 +20683,16 @@ static PyObject *_wrap_TimeSpan_Hours(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "hours", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Hours",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Hours",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Hours(arg1); @@ -19660,11 +20741,16 @@ static PyObject *_wrap_TimeSpan_Days(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "days", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Days",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Days",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Days(arg1); @@ -19713,11 +20799,16 @@ static PyObject *_wrap_TimeSpan_Weeks(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "days", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Weeks",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Weeks",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Weeks(arg1); @@ -19769,11 +20860,39 @@ static PyObject *_wrap_new_TimeSpan(PyObject *self, PyObject *args, PyObject *kw long arg3 = (long) 0 ; long arg4 = (long) 0 ; wxTimeSpan *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "hours",(char *) "minutes",(char *) "seconds",(char *) "milliseconds", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|llll:new_TimeSpan",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TimeSpan",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTimeSpan *)new wxTimeSpan(arg1,arg2,arg3,arg4); @@ -19886,12 +21005,17 @@ static PyObject *_wrap_TimeSpan_Multiply(PyObject *self, PyObject *args, PyObjec int arg2 ; wxTimeSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TimeSpan_Multiply",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan_Multiply",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -20040,12 +21164,17 @@ static PyObject *_wrap_TimeSpan___imul__(PyObject *self, PyObject *args, PyObjec int arg2 ; wxTimeSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TimeSpan___imul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___imul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -20167,12 +21296,17 @@ static PyObject *_wrap_TimeSpan___mul__(PyObject *self, PyObject *args, PyObject int arg2 ; wxTimeSpan result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TimeSpan___mul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___mul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan___mul__(arg1,arg2); @@ -20197,12 +21331,17 @@ static PyObject *_wrap_TimeSpan___rmul__(PyObject *self, PyObject *args, PyObjec int arg2 ; wxTimeSpan result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TimeSpan___rmul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___rmul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan___rmul__(arg1,arg2); @@ -20245,7 +21384,7 @@ static PyObject *_wrap_TimeSpan___lt__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20276,7 +21415,7 @@ static PyObject *_wrap_TimeSpan___le__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20307,7 +21446,7 @@ static PyObject *_wrap_TimeSpan___gt__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20338,7 +21477,7 @@ static PyObject *_wrap_TimeSpan___ge__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20369,7 +21508,7 @@ static PyObject *_wrap_TimeSpan___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20400,7 +21539,7 @@ static PyObject *_wrap_TimeSpan___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20425,7 +21564,7 @@ static PyObject *_wrap_TimeSpan_IsNull(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20450,7 +21589,7 @@ static PyObject *_wrap_TimeSpan_IsPositive(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20475,7 +21614,7 @@ static PyObject *_wrap_TimeSpan_IsNegative(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20506,7 +21645,7 @@ static PyObject *_wrap_TimeSpan_IsEqualTo(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20537,7 +21676,7 @@ static PyObject *_wrap_TimeSpan_IsLongerThan(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20568,7 +21707,7 @@ static PyObject *_wrap_TimeSpan_IsShorterThan(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20593,7 +21732,7 @@ static PyObject *_wrap_TimeSpan_GetWeeks(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20618,7 +21757,7 @@ static PyObject *_wrap_TimeSpan_GetDays(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20643,7 +21782,7 @@ static PyObject *_wrap_TimeSpan_GetHours(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20668,7 +21807,7 @@ static PyObject *_wrap_TimeSpan_GetMinutes(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20811,11 +21950,39 @@ static PyObject *_wrap_new_DateSpan(PyObject *self, PyObject *args, PyObject *kw int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxDateSpan *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "years",(char *) "months",(char *) "weeks",(char *) "days", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_DateSpan",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_DateSpan",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateSpan *)new wxDateSpan(arg1,arg2,arg3,arg4); @@ -20858,11 +22025,16 @@ static PyObject *_wrap_DateSpan_Days(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; int arg1 ; wxDateSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "days", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateSpan_Days",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Days",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan::Days(arg1); @@ -20911,11 +22083,16 @@ static PyObject *_wrap_DateSpan_Weeks(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; wxDateSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "weeks", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateSpan_Weeks",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Weeks",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan::Weeks(arg1); @@ -20964,11 +22141,16 @@ static PyObject *_wrap_DateSpan_Months(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 ; wxDateSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mon", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateSpan_Months",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Months",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan::Months(arg1); @@ -21017,11 +22199,16 @@ static PyObject *_wrap_DateSpan_Years(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; wxDateSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "years", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateSpan_Years",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Years",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan::Years(arg1); @@ -21072,12 +22259,17 @@ static PyObject *_wrap_DateSpan_SetYears(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_SetYears",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetYears",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21101,12 +22293,17 @@ static PyObject *_wrap_DateSpan_SetMonths(PyObject *self, PyObject *args, PyObje int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_SetMonths",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetMonths",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21130,12 +22327,17 @@ static PyObject *_wrap_DateSpan_SetWeeks(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_SetWeeks",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetWeeks",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21159,12 +22361,17 @@ static PyObject *_wrap_DateSpan_SetDays(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_SetDays",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetDays",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21200,7 +22407,7 @@ static PyObject *_wrap_DateSpan_GetYears(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21225,7 +22432,7 @@ static PyObject *_wrap_DateSpan_GetMonths(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21250,7 +22457,7 @@ static PyObject *_wrap_DateSpan_GetWeeks(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21275,7 +22482,7 @@ static PyObject *_wrap_DateSpan_GetDays(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21300,7 +22507,7 @@ static PyObject *_wrap_DateSpan_GetTotalDays(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21409,12 +22616,17 @@ static PyObject *_wrap_DateSpan_Multiply(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "factor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_Multiply",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_Multiply",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21534,12 +22746,17 @@ static PyObject *_wrap_DateSpan___imul__(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "factor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan___imul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___imul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21633,12 +22850,17 @@ static PyObject *_wrap_DateSpan___mul__(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateSpan result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan___mul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___mul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan___mul__(arg1,arg2); @@ -21663,12 +22885,17 @@ static PyObject *_wrap_DateSpan___rmul__(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan___rmul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___rmul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan___rmul__(arg1,arg2); @@ -21711,7 +22938,7 @@ static PyObject *_wrap_DateSpan___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21742,7 +22969,7 @@ static PyObject *_wrap_DateSpan___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21771,7 +22998,7 @@ static PyObject *_wrap_GetLocalTime(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21793,7 +23020,7 @@ static PyObject *_wrap_GetUTCTime(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21815,7 +23042,7 @@ static PyObject *_wrap_GetCurrentTime(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21859,11 +23086,16 @@ static PyObject *_wrap_new_DataFormat(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; wxDataFormat *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:new_DataFormat",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DataFormat",kwnames,&obj0)) goto fail; + { + arg1 = (wxDataFormatId) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDataFormat *)new wxDataFormat((wxDataFormatId )arg1); @@ -21946,9 +23178,14 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args) int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi:DataFormat___eq__",&obj0,&arg2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___eq__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxDataFormat const *)arg1)->operator ==(arg2); @@ -21956,7 +23193,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21969,9 +23206,14 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi:DataFormat___ne__",&obj0,&arg2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___ne__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxDataFormat const *)arg1)->operator !=(arg2); @@ -21979,7 +23221,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22007,7 +23249,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_1(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22062,7 +23304,7 @@ static PyObject *_wrap_DataFormat___eq__(PyObject *self, PyObject *args) { } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -22102,7 +23344,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_1(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22157,7 +23399,7 @@ static PyObject *_wrap_DataFormat___ne__(PyObject *self, PyObject *args) { } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -22181,12 +23423,17 @@ static PyObject *_wrap_DataFormat_SetType(PyObject *self, PyObject *args, PyObje wxDataFormat *arg1 = (wxDataFormat *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "format", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DataFormat_SetType",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DataFormat_SetType",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDataFormatId) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetType((wxDataFormatId )arg2); @@ -22219,7 +23466,7 @@ static PyObject *_wrap_DataFormat_GetType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22304,7 +23551,7 @@ static PyObject * DataFormat_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_FormatInvalid_set(PyObject *_val) { +static int _wrap_FormatInvalid_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FormatInvalid is read-only."); return 1; } @@ -22348,12 +23595,19 @@ static PyObject *_wrap_DataObject_GetPreferredFormat(PyObject *self, PyObject *a int arg2 = (int) wxDataObject::Get ; SwigValueWrapper< wxDataFormat > result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DataObject_GetPreferredFormat",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DataObject_GetPreferredFormat",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDataObject::Direction) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxDataObject const *)arg1)->GetPreferredFormat((wxDataObject::Direction )arg2); @@ -22378,12 +23632,19 @@ static PyObject *_wrap_DataObject_GetFormatCount(PyObject *self, PyObject *args, int arg2 = (int) wxDataObject::Get ; size_t result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DataObject_GetFormatCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DataObject_GetFormatCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDataObject::Direction) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (size_t)((wxDataObject const *)arg1)->GetFormatCount((wxDataObject::Direction )arg2); @@ -22391,7 +23652,7 @@ static PyObject *_wrap_DataObject_GetFormatCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22406,16 +23667,23 @@ static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, Py bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "format",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObject_IsSupported",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DataObject_IsSupported",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (wxDataObject::Direction) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxDataObject const *)arg1)->IsSupported((wxDataFormat const &)*arg2,(wxDataObject::Direction )arg3); @@ -22423,7 +23691,7 @@ static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22454,7 +23722,7 @@ static PyObject *_wrap_DataObject_GetDataSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22468,13 +23736,20 @@ static PyObject *_wrap_DataObject_GetAllFormats(PyObject *self, PyObject *args, int arg3 = (int) wxDataObject::Get ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "formats",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObject_GetAllFormats",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DataObject_GetAllFormats",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (wxDataObject::Direction) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxDataObject const *)arg1)->GetAllFormats(arg2,(wxDataObject::Direction )arg3); @@ -22516,7 +23791,7 @@ static PyObject *_wrap_DataObject_GetDataHere(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22545,7 +23820,7 @@ static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObje PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -22556,7 +23831,7 @@ static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22763,13 +24038,20 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P int arg3 = (int) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dataObject",(char *) "preferred", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObjectComposite_Add",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DataObjectComposite_Add",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObjectComposite,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObjectSimple,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Add(arg2,arg3); @@ -22850,7 +24132,7 @@ static PyObject *_wrap_TextDataObject_GetTextLength(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -23316,7 +24598,7 @@ static PyObject *_wrap_CustomDataObject_SetData(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23341,7 +24623,7 @@ static PyObject *_wrap_CustomDataObject_GetSize(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -23572,11 +24854,16 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "res", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:IsDragResultOk",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IsDragResultOk",kwnames,&obj0)) goto fail; + { + arg1 = (wxDragResult) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxIsDragResultOk((wxDragResult )arg1); @@ -23584,7 +24871,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23652,14 +24939,19 @@ static PyObject *_wrap_DropSource__setCallbackInfo(PyObject *self, PyObject *arg PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOi:DropSource__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropSource__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropSource,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->_setCallbackInfo(arg2,arg3,arg4); @@ -23759,13 +25051,18 @@ static PyObject *_wrap_DropSource_SetCursor(PyObject *self, PyObject *args, PyOb int arg2 ; wxCursor *arg3 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "res",(char *) "cursor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:DropSource_SetCursor",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DropSource_SetCursor",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropSource,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDragResult) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -23790,12 +25087,19 @@ static PyObject *_wrap_DropSource_DoDragDrop(PyObject *self, PyObject *args, PyO int arg2 = (int) wxDrag_CopyOnly ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DropSource_DoDragDrop",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DropSource_DoDragDrop",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropSource,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->DoDragDrop(arg2); @@ -23803,7 +25107,7 @@ static PyObject *_wrap_DropSource_DoDragDrop(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23816,12 +25120,17 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *ar int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "effect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DropSource_base_GiveFeedback",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropSource_base_GiveFeedback",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropSource,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDragResult) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_GiveFeedback((wxDragResult )arg2); @@ -23829,7 +25138,7 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23984,12 +25293,27 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, P int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:DropTarget_base_OnEnter",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnEnter(arg2,arg3,(wxDragResult )arg4); @@ -23997,7 +25321,7 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24012,12 +25336,27 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:DropTarget_base_OnDragOver",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnDragOver(arg2,arg3,(wxDragResult )arg4); @@ -24025,7 +25364,7 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24063,12 +25402,22 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, Py int arg3 ; bool 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 *)"Oii:DropTarget_base_OnDrop",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnDrop(arg2,arg3); @@ -24076,7 +25425,7 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24101,7 +25450,7 @@ static PyObject *_wrap_DropTarget_GetData(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24175,12 +25524,27 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *arg int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:TextDropTarget_base_OnEnter",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnEnter(arg2,arg3,(wxDragResult )arg4); @@ -24188,7 +25552,7 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24203,12 +25567,27 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject * int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:TextDropTarget_base_OnDragOver",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnDragOver(arg2,arg3,(wxDragResult )arg4); @@ -24216,7 +25595,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24254,12 +25633,22 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args int arg3 ; bool 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 *)"Oii:TextDropTarget_base_OnDrop",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextDropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnDrop(arg2,arg3); @@ -24267,7 +25656,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24282,12 +25671,27 @@ static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:TextDropTarget_base_OnData",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnData(arg2,arg3,(wxDragResult )arg4); @@ -24295,7 +25699,7 @@ static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24369,12 +25773,27 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *arg int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:FileDropTarget_base_OnEnter",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnEnter(arg2,arg3,(wxDragResult )arg4); @@ -24382,7 +25801,7 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24397,12 +25816,27 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject * int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:FileDropTarget_base_OnDragOver",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnDragOver(arg2,arg3,(wxDragResult )arg4); @@ -24410,7 +25844,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24448,12 +25882,22 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args int arg3 ; bool 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 *)"Oii:FileDropTarget_base_OnDrop",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FileDropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnDrop(arg2,arg3); @@ -24461,7 +25905,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24476,12 +25920,27 @@ static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:FileDropTarget_base_OnData",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnData(arg2,arg3,(wxDragResult )arg4); @@ -24489,7 +25948,7 @@ static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24567,7 +26026,7 @@ static PyObject *_wrap_Clipboard_Open(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24616,7 +26075,7 @@ static PyObject *_wrap_Clipboard_IsOpened(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24644,7 +26103,7 @@ static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24672,7 +26131,7 @@ static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24703,7 +26162,7 @@ static PyObject *_wrap_Clipboard_IsSupported(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24734,7 +26193,7 @@ static PyObject *_wrap_Clipboard_GetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24783,7 +26242,7 @@ static PyObject *_wrap_Clipboard_Flush(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24804,7 +26263,7 @@ static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -24829,7 +26288,7 @@ static PyObject * Clipboard_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TheClipboard_set(PyObject *_val) { +static int _wrap_TheClipboard_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheClipboard is read-only."); return 1; } @@ -24912,7 +26371,7 @@ static PyObject *_wrap_ClipboardLocker___nonzero__(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26215,12 +27674,12 @@ static swig_type_info _swigt__p_wxLogStderr[] = {{"_p_wxLogStderr", 0, "wxLogStd static swig_type_info _swigt__p_wxLogTextCtrl[] = {{"_p_wxLogTextCtrl", 0, "wxLogTextCtrl *", 0},{"_p_wxLogTextCtrl"},{0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0},{"_p_wxTextCtrl"},{0}}; static swig_type_info _swigt__p_wxBusyCursor[] = {{"_p_wxBusyCursor", 0, "wxBusyCursor *", 0},{"_p_wxBusyCursor"},{0}}; -static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0},{"_p_wxFileDataObject"},{0}}; static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0},{"_p_wxPyBitmapDataObject"},{0}}; static swig_type_info _swigt__p_wxPyTextDataObject[] = {{"_p_wxPyTextDataObject", 0, "wxPyTextDataObject *", 0},{"_p_wxPyTextDataObject"},{0}}; static swig_type_info _swigt__p_wxBitmapDataObject[] = {{"_p_wxBitmapDataObject", 0, "wxBitmapDataObject *", 0},{"_p_wxBitmapDataObject"},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxBitmapDataObject},{0}}; static swig_type_info _swigt__p_wxTextDataObject[] = {{"_p_wxTextDataObject", 0, "wxTextDataObject *", 0},{"_p_wxTextDataObject"},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxTextDataObject},{0}}; static swig_type_info _swigt__p_wxDataObject[] = {{"_p_wxDataObject", 0, "wxDataObject *", 0},{"_p_wxDataObjectSimple", _p_wxDataObjectSimpleTo_p_wxDataObject},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObject},{"_p_wxDataObjectComposite", _p_wxDataObjectCompositeTo_p_wxDataObject},{"_p_wxDataObject"},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObject},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObject},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObject},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObject},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObject},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObject},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObject},{"_p_wxURLDataObject", _p_wxURLDataObjectTo_p_wxDataObject},{0}}; +static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0},{"_p_wxFileDataObject"},{0}}; static swig_type_info _swigt__p_wxCustomDataObject[] = {{"_p_wxCustomDataObject", 0, "wxCustomDataObject *", 0},{"_p_wxCustomDataObject"},{0}}; static swig_type_info _swigt__p_wxURLDataObject[] = {{"_p_wxURLDataObject", 0, "wxURLDataObject *", 0},{"_p_wxURLDataObject"},{0}}; static swig_type_info _swigt__p_wxMetafileDataObject[] = {{"_p_wxMetafileDataObject", 0, "wxMetafileDataObject *", 0},{"_p_wxMetafileDataObject"},{0}}; @@ -26237,6 +27696,7 @@ static swig_type_info _swigt__p_wxPyDataObjectSimple[] = {{"_p_wxPyDataObjectSim static swig_type_info _swigt__p_wxDataObjectSimple[] = {{"_p_wxDataObjectSimple", 0, "wxDataObjectSimple *", 0},{"_p_wxDataObjectSimple"},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObjectSimple},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObjectSimple},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObjectSimple},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObjectSimple},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObjectSimple},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObjectSimple},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObjectSimple},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObjectSimple},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxSingleInstanceChecker[] = {{"_p_wxSingleInstanceChecker", 0, "wxSingleInstanceChecker *", 0},{"_p_wxSingleInstanceChecker"},{0}}; static swig_type_info _swigt__p_wxFileTypeInfo[] = {{"_p_wxFileTypeInfo", 0, "wxFileTypeInfo *", 0},{"_p_wxFileTypeInfo"},{0}}; static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxFrame"},{0}}; @@ -26300,12 +27760,12 @@ _swigt__p_wxLogStderr, _swigt__p_wxLogTextCtrl, _swigt__p_wxTextCtrl, _swigt__p_wxBusyCursor, -_swigt__p_wxFileDataObject, _swigt__p_wxPyBitmapDataObject, _swigt__p_wxPyTextDataObject, _swigt__p_wxBitmapDataObject, _swigt__p_wxTextDataObject, _swigt__p_wxDataObject, +_swigt__p_wxFileDataObject, _swigt__p_wxCustomDataObject, _swigt__p_wxURLDataObject, _swigt__p_wxMetafileDataObject, @@ -26322,6 +27782,7 @@ _swigt__p_wxPyDataObjectSimple, _swigt__p_wxDataObjectSimple, _swigt__p_wxEvtHandler, _swigt__p_wxRect, +_swigt__p_char, _swigt__p_wxSingleInstanceChecker, _swigt__p_wxFileTypeInfo, _swigt__p_wxFrame, @@ -26363,364 +27824,11 @@ _swigt__p_wxDateSpan, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"SYS_OEM_FIXED_FONT", (long) wxSYS_OEM_FIXED_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ANSI_FIXED_FONT", (long) wxSYS_ANSI_FIXED_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ANSI_VAR_FONT", (long) wxSYS_ANSI_VAR_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SYSTEM_FONT", (long) wxSYS_SYSTEM_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DEVICE_DEFAULT_FONT", (long) wxSYS_DEVICE_DEFAULT_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DEFAULT_PALETTE", (long) wxSYS_DEFAULT_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SYSTEM_FIXED_FONT", (long) wxSYS_SYSTEM_FIXED_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DEFAULT_GUI_FONT", (long) wxSYS_DEFAULT_GUI_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICONTITLE_FONT", (long) wxSYS_ICONTITLE_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_SCROLLBAR", (long) wxSYS_COLOUR_SCROLLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BACKGROUND", (long) wxSYS_COLOUR_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_DESKTOP", (long) wxSYS_COLOUR_DESKTOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_ACTIVECAPTION", (long) wxSYS_COLOUR_ACTIVECAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INACTIVECAPTION", (long) wxSYS_COLOUR_INACTIVECAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MENU", (long) wxSYS_COLOUR_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_WINDOW", (long) wxSYS_COLOUR_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_WINDOWFRAME", (long) wxSYS_COLOUR_WINDOWFRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MENUTEXT", (long) wxSYS_COLOUR_MENUTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_WINDOWTEXT", (long) wxSYS_COLOUR_WINDOWTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_CAPTIONTEXT", (long) wxSYS_COLOUR_CAPTIONTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_ACTIVEBORDER", (long) wxSYS_COLOUR_ACTIVEBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INACTIVEBORDER", (long) wxSYS_COLOUR_INACTIVEBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_APPWORKSPACE", (long) wxSYS_COLOUR_APPWORKSPACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_HIGHLIGHT", (long) wxSYS_COLOUR_HIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_HIGHLIGHTTEXT", (long) wxSYS_COLOUR_HIGHLIGHTTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNFACE", (long) wxSYS_COLOUR_BTNFACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DFACE", (long) wxSYS_COLOUR_3DFACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNSHADOW", (long) wxSYS_COLOUR_BTNSHADOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DSHADOW", (long) wxSYS_COLOUR_3DSHADOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_GRAYTEXT", (long) wxSYS_COLOUR_GRAYTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNTEXT", (long) wxSYS_COLOUR_BTNTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INACTIVECAPTIONTEXT", (long) wxSYS_COLOUR_INACTIVECAPTIONTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNHIGHLIGHT", (long) wxSYS_COLOUR_BTNHIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNHILIGHT", (long) wxSYS_COLOUR_BTNHILIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DHIGHLIGHT", (long) wxSYS_COLOUR_3DHIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DHILIGHT", (long) wxSYS_COLOUR_3DHILIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DDKSHADOW", (long) wxSYS_COLOUR_3DDKSHADOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DLIGHT", (long) wxSYS_COLOUR_3DLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INFOTEXT", (long) wxSYS_COLOUR_INFOTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INFOBK", (long) wxSYS_COLOUR_INFOBK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_LISTBOX", (long) wxSYS_COLOUR_LISTBOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_HOTLIGHT", (long) wxSYS_COLOUR_HOTLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_GRADIENTACTIVECAPTION", (long) wxSYS_COLOUR_GRADIENTACTIVECAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_GRADIENTINACTIVECAPTION", (long) wxSYS_COLOUR_GRADIENTINACTIVECAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MENUHILIGHT", (long) wxSYS_COLOUR_MENUHILIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MENUBAR", (long) wxSYS_COLOUR_MENUBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MAX", (long) wxSYS_COLOUR_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_MOUSE_BUTTONS", (long) wxSYS_MOUSE_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_BORDER_X", (long) wxSYS_BORDER_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_BORDER_Y", (long) wxSYS_BORDER_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CURSOR_X", (long) wxSYS_CURSOR_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CURSOR_Y", (long) wxSYS_CURSOR_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DCLICK_X", (long) wxSYS_DCLICK_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DCLICK_Y", (long) wxSYS_DCLICK_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DRAG_X", (long) wxSYS_DRAG_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DRAG_Y", (long) wxSYS_DRAG_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_EDGE_X", (long) wxSYS_EDGE_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_EDGE_Y", (long) wxSYS_EDGE_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_HSCROLL_ARROW_X", (long) wxSYS_HSCROLL_ARROW_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_HSCROLL_ARROW_Y", (long) wxSYS_HSCROLL_ARROW_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_HTHUMB_X", (long) wxSYS_HTHUMB_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICON_X", (long) wxSYS_ICON_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICON_Y", (long) wxSYS_ICON_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICONSPACING_X", (long) wxSYS_ICONSPACING_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICONSPACING_Y", (long) wxSYS_ICONSPACING_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_WINDOWMIN_X", (long) wxSYS_WINDOWMIN_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_WINDOWMIN_Y", (long) wxSYS_WINDOWMIN_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_X", (long) wxSYS_SCREEN_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_Y", (long) wxSYS_SCREEN_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_FRAMESIZE_X", (long) wxSYS_FRAMESIZE_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_FRAMESIZE_Y", (long) wxSYS_FRAMESIZE_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SMALLICON_X", (long) wxSYS_SMALLICON_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SMALLICON_Y", (long) wxSYS_SMALLICON_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_HSCROLL_Y", (long) wxSYS_HSCROLL_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_VSCROLL_X", (long) wxSYS_VSCROLL_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_VSCROLL_ARROW_X", (long) wxSYS_VSCROLL_ARROW_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_VSCROLL_ARROW_Y", (long) wxSYS_VSCROLL_ARROW_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_VTHUMB_Y", (long) wxSYS_VTHUMB_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CAPTION_Y", (long) wxSYS_CAPTION_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_MENU_Y", (long) wxSYS_MENU_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_NETWORK_PRESENT", (long) wxSYS_NETWORK_PRESENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_PENWINDOWS_PRESENT", (long) wxSYS_PENWINDOWS_PRESENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SHOW_SOUNDS", (long) wxSYS_SHOW_SOUNDS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SWAP_BUTTONS", (long) wxSYS_SWAP_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CAN_DRAW_FRAME_DECORATIONS", (long) wxSYS_CAN_DRAW_FRAME_DECORATIONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CAN_ICONIZE_FRAME", (long) wxSYS_CAN_ICONIZE_FRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_NONE", (long) wxSYS_SCREEN_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_TINY", (long) wxSYS_SCREEN_TINY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_PDA", (long) wxSYS_SCREEN_PDA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_SMALL", (long) wxSYS_SCREEN_SMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_DESKTOP", (long) wxSYS_SCREEN_DESKTOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHUTDOWN_POWEROFF", (long) wxSHUTDOWN_POWEROFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHUTDOWN_REBOOT", (long) wxSHUTDOWN_REBOOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TIMER_CONTINUOUS", (long) wxTIMER_CONTINUOUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TIMER_ONE_SHOT", (long) wxTIMER_ONE_SHOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TIMER", (long) wxEVT_TIMER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_FatalError", (long) wxLOG_FatalError, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Error", (long) wxLOG_Error, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Warning", (long) wxLOG_Warning, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Message", (long) wxLOG_Message, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Status", (long) wxLOG_Status, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Info", (long) wxLOG_Info, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Debug", (long) wxLOG_Debug, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Trace", (long) wxLOG_Trace, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Progress", (long) wxLOG_Progress, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_User", (long) wxLOG_User, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Max", (long) wxLOG_Max, 0, 0, 0}, { SWIG_PY_STRING, (char*)"TRACE_MemAlloc", 0, 0, (void *)"memalloc", 0}, { SWIG_PY_STRING, (char*)"TRACE_Messages", 0, 0, (void *)"messages", 0}, { SWIG_PY_STRING, (char*)"TRACE_ResAlloc", 0, 0, (void *)"resalloc", 0}, { SWIG_PY_STRING, (char*)"TRACE_RefCount", 0, 0, (void *)"refcount", 0}, { SWIG_PY_STRING, (char*)"TRACE_OleCalls", 0, 0, (void *)"ole", 0}, -{ SWIG_PY_INT, (char *)"TraceMemAlloc", (long) 0x0001, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TraceMessages", (long) 0x0002, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TraceResAlloc", (long) 0x0004, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TraceRefCount", (long) 0x0008, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TraceOleCalls", (long) 0x0100, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PROCESS_DEFAULT", (long) wxPROCESS_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PROCESS_REDIRECT", (long) wxPROCESS_REDIRECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_OK", (long) wxKILL_OK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_BAD_SIGNAL", (long) wxKILL_BAD_SIGNAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_ACCESS_DENIED", (long) wxKILL_ACCESS_DENIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_NO_PROCESS", (long) wxKILL_NO_PROCESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_ERROR", (long) wxKILL_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGNONE", (long) wxSIGNONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGHUP", (long) wxSIGHUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGINT", (long) wxSIGINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGQUIT", (long) wxSIGQUIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGILL", (long) wxSIGILL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGTRAP", (long) wxSIGTRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGABRT", (long) wxSIGABRT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGIOT", (long) wxSIGIOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGEMT", (long) wxSIGEMT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGFPE", (long) wxSIGFPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGKILL", (long) wxSIGKILL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGBUS", (long) wxSIGBUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGSEGV", (long) wxSIGSEGV, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGSYS", (long) wxSIGSYS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGPIPE", (long) wxSIGPIPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGALRM", (long) wxSIGALRM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGTERM", (long) wxSIGTERM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_END_PROCESS", (long) wxEVT_END_PROCESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXEC_ASYNC", (long) wxEXEC_ASYNC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXEC_SYNC", (long) wxEXEC_SYNC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXEC_NOHIDE", (long) wxEXEC_NOHIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXEC_MAKE_GROUP_LEADER", (long) wxEXEC_MAKE_GROUP_LEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOYSTICK1", (long) wxJOYSTICK1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOYSTICK2", (long) wxJOYSTICK2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON_ANY", (long) wxJOY_BUTTON_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON1", (long) wxJOY_BUTTON1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON2", (long) wxJOY_BUTTON2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON3", (long) wxJOY_BUTTON3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON4", (long) wxJOY_BUTTON4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_JOY_BUTTON_DOWN", (long) wxEVT_JOY_BUTTON_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_JOY_BUTTON_UP", (long) wxEVT_JOY_BUTTON_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_JOY_MOVE", (long) wxEVT_JOY_MOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_JOY_ZMOVE", (long) wxEVT_JOY_ZMOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_STANDARD", (long) wxMAILCAP_STANDARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_NETSCAPE", (long) wxMAILCAP_NETSCAPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_KDE", (long) wxMAILCAP_KDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_GNOME", (long) wxMAILCAP_GNOME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_ALL", (long) wxMAILCAP_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONFIG_USE_LOCAL_FILE", (long) wxCONFIG_USE_LOCAL_FILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONFIG_USE_GLOBAL_FILE", (long) wxCONFIG_USE_GLOBAL_FILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONFIG_USE_RELATIVE_PATH", (long) wxCONFIG_USE_RELATIVE_PATH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONFIG_USE_NO_ESCAPE_CHARACTERS", (long) wxCONFIG_USE_NO_ESCAPE_CHARACTERS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_Unknown", (long) wxConfigBase::Type_Unknown, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_String", (long) wxConfigBase::Type_String, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_Boolean", (long) wxConfigBase::Type_Boolean, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_Integer", (long) wxConfigBase::Type_Integer, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_Float", (long) wxConfigBase::Type_Float, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Local", (long) wxDateTime::Local, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_12", (long) wxDateTime::GMT_12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_11", (long) wxDateTime::GMT_11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_10", (long) wxDateTime::GMT_10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_9", (long) wxDateTime::GMT_9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_8", (long) wxDateTime::GMT_8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_7", (long) wxDateTime::GMT_7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_6", (long) wxDateTime::GMT_6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_5", (long) wxDateTime::GMT_5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_4", (long) wxDateTime::GMT_4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_3", (long) wxDateTime::GMT_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_2", (long) wxDateTime::GMT_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_1", (long) wxDateTime::GMT_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT0", (long) wxDateTime::GMT0, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT1", (long) wxDateTime::GMT1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT2", (long) wxDateTime::GMT2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT3", (long) wxDateTime::GMT3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT4", (long) wxDateTime::GMT4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT5", (long) wxDateTime::GMT5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT6", (long) wxDateTime::GMT6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT7", (long) wxDateTime::GMT7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT8", (long) wxDateTime::GMT8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT9", (long) wxDateTime::GMT9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT10", (long) wxDateTime::GMT10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT11", (long) wxDateTime::GMT11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT12", (long) wxDateTime::GMT12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_WET", (long) wxDateTime::WET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_WEST", (long) wxDateTime::WEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_CET", (long) wxDateTime::CET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_CEST", (long) wxDateTime::CEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_EET", (long) wxDateTime::EET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_EEST", (long) wxDateTime::EEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_MSK", (long) wxDateTime::MSK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_MSD", (long) wxDateTime::MSD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_AST", (long) wxDateTime::AST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_ADT", (long) wxDateTime::ADT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_EST", (long) wxDateTime::EST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_EDT", (long) wxDateTime::EDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_CST", (long) wxDateTime::CST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_CDT", (long) wxDateTime::CDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_MST", (long) wxDateTime::MST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_MDT", (long) wxDateTime::MDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_PST", (long) wxDateTime::PST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_PDT", (long) wxDateTime::PDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_HST", (long) wxDateTime::HST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_AKST", (long) wxDateTime::AKST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_AKDT", (long) wxDateTime::AKDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_A_WST", (long) wxDateTime::A_WST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_A_CST", (long) wxDateTime::A_CST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_A_EST", (long) wxDateTime::A_EST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_A_ESST", (long) wxDateTime::A_ESST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_UTC", (long) wxDateTime::UTC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gregorian", (long) wxDateTime::Gregorian, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Julian", (long) wxDateTime::Julian, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Unknown", (long) wxDateTime::Gr_Unknown, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Standard", (long) wxDateTime::Gr_Standard, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Alaska", (long) wxDateTime::Gr_Alaska, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Albania", (long) wxDateTime::Gr_Albania, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria", (long) wxDateTime::Gr_Austria, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Brixen", (long) wxDateTime::Gr_Austria_Brixen, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Salzburg", (long) wxDateTime::Gr_Austria_Salzburg, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Tyrol", (long) wxDateTime::Gr_Austria_Tyrol, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Carinthia", (long) wxDateTime::Gr_Austria_Carinthia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Styria", (long) wxDateTime::Gr_Austria_Styria, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Belgium", (long) wxDateTime::Gr_Belgium, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Bulgaria", (long) wxDateTime::Gr_Bulgaria, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Bulgaria_1", (long) wxDateTime::Gr_Bulgaria_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Bulgaria_2", (long) wxDateTime::Gr_Bulgaria_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Bulgaria_3", (long) wxDateTime::Gr_Bulgaria_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Canada", (long) wxDateTime::Gr_Canada, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_China", (long) wxDateTime::Gr_China, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_China_1", (long) wxDateTime::Gr_China_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_China_2", (long) wxDateTime::Gr_China_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Czechoslovakia", (long) wxDateTime::Gr_Czechoslovakia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Denmark", (long) wxDateTime::Gr_Denmark, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Egypt", (long) wxDateTime::Gr_Egypt, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Estonia", (long) wxDateTime::Gr_Estonia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Finland", (long) wxDateTime::Gr_Finland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_France", (long) wxDateTime::Gr_France, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_France_Alsace", (long) wxDateTime::Gr_France_Alsace, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_France_Lorraine", (long) wxDateTime::Gr_France_Lorraine, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_France_Strasbourg", (long) wxDateTime::Gr_France_Strasbourg, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Germany", (long) wxDateTime::Gr_Germany, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Germany_Catholic", (long) wxDateTime::Gr_Germany_Catholic, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Germany_Prussia", (long) wxDateTime::Gr_Germany_Prussia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Germany_Protestant", (long) wxDateTime::Gr_Germany_Protestant, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_GreatBritain", (long) wxDateTime::Gr_GreatBritain, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Greece", (long) wxDateTime::Gr_Greece, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Hungary", (long) wxDateTime::Gr_Hungary, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Ireland", (long) wxDateTime::Gr_Ireland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Italy", (long) wxDateTime::Gr_Italy, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Japan", (long) wxDateTime::Gr_Japan, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Japan_1", (long) wxDateTime::Gr_Japan_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Japan_2", (long) wxDateTime::Gr_Japan_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Japan_3", (long) wxDateTime::Gr_Japan_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Latvia", (long) wxDateTime::Gr_Latvia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Lithuania", (long) wxDateTime::Gr_Lithuania, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Luxemburg", (long) wxDateTime::Gr_Luxemburg, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands", (long) wxDateTime::Gr_Netherlands, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands_Groningen", (long) wxDateTime::Gr_Netherlands_Groningen, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands_Gelderland", (long) wxDateTime::Gr_Netherlands_Gelderland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands_Utrecht", (long) wxDateTime::Gr_Netherlands_Utrecht, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands_Friesland", (long) wxDateTime::Gr_Netherlands_Friesland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Norway", (long) wxDateTime::Gr_Norway, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Poland", (long) wxDateTime::Gr_Poland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Portugal", (long) wxDateTime::Gr_Portugal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Romania", (long) wxDateTime::Gr_Romania, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Russia", (long) wxDateTime::Gr_Russia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Scotland", (long) wxDateTime::Gr_Scotland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Spain", (long) wxDateTime::Gr_Spain, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Sweden", (long) wxDateTime::Gr_Sweden, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Switzerland", (long) wxDateTime::Gr_Switzerland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Switzerland_Catholic", (long) wxDateTime::Gr_Switzerland_Catholic, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Switzerland_Protestant", (long) wxDateTime::Gr_Switzerland_Protestant, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Turkey", (long) wxDateTime::Gr_Turkey, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_USA", (long) wxDateTime::Gr_USA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Wales", (long) wxDateTime::Gr_Wales, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Yugoslavia", (long) wxDateTime::Gr_Yugoslavia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_Unknown", (long) wxDateTime::Country_Unknown, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_Default", (long) wxDateTime::Country_Default, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_WesternEurope_Start", (long) wxDateTime::Country_WesternEurope_Start, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_EEC", (long) wxDateTime::Country_EEC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_France", (long) wxDateTime::France, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Germany", (long) wxDateTime::Germany, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_UK", (long) wxDateTime::UK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_WesternEurope_End", (long) wxDateTime::Country_WesternEurope_End, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Russia", (long) wxDateTime::Russia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_USA", (long) wxDateTime::USA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Jan", (long) wxDateTime::Jan, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Feb", (long) wxDateTime::Feb, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Mar", (long) wxDateTime::Mar, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Apr", (long) wxDateTime::Apr, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_May", (long) wxDateTime::May, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Jun", (long) wxDateTime::Jun, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Jul", (long) wxDateTime::Jul, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Aug", (long) wxDateTime::Aug, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Sep", (long) wxDateTime::Sep, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Oct", (long) wxDateTime::Oct, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Nov", (long) wxDateTime::Nov, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Dec", (long) wxDateTime::Dec, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Inv_Month", (long) wxDateTime::Inv_Month, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Sun", (long) wxDateTime::Sun, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Mon", (long) wxDateTime::Mon, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Tue", (long) wxDateTime::Tue, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Wed", (long) wxDateTime::Wed, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Thu", (long) wxDateTime::Thu, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Fri", (long) wxDateTime::Fri, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Sat", (long) wxDateTime::Sat, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Inv_WeekDay", (long) wxDateTime::Inv_WeekDay, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Inv_Year", (long) wxDateTime::Inv_Year, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Name_Full", (long) wxDateTime::Name_Full, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Name_Abbr", (long) wxDateTime::Name_Abbr, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Default_First", (long) wxDateTime::Default_First, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Monday_First", (long) wxDateTime::Monday_First, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Sunday_First", (long) wxDateTime::Sunday_First, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_INVALID", (long) wxDF_INVALID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_TEXT", (long) wxDF_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_BITMAP", (long) wxDF_BITMAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_METAFILE", (long) wxDF_METAFILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_SYLK", (long) wxDF_SYLK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_DIF", (long) wxDF_DIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_TIFF", (long) wxDF_TIFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_OEMTEXT", (long) wxDF_OEMTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_DIB", (long) wxDF_DIB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_PALETTE", (long) wxDF_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_PENDATA", (long) wxDF_PENDATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_RIFF", (long) wxDF_RIFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_WAVE", (long) wxDF_WAVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_UNICODETEXT", (long) wxDF_UNICODETEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_ENHMETAFILE", (long) wxDF_ENHMETAFILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_FILENAME", (long) wxDF_FILENAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_LOCALE", (long) wxDF_LOCALE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_PRIVATE", (long) wxDF_PRIVATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_HTML", (long) wxDF_HTML, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_MAX", (long) wxDF_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DataObject_Get", (long) wxDataObject::Get, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DataObject_Set", (long) wxDataObject::Set, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DataObject_Both", (long) wxDataObject::Both, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Drag_CopyOnly", (long) wxDrag_CopyOnly, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Drag_AllowMove", (long) wxDrag_AllowMove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Drag_DefaultMove", (long) wxDrag_DefaultMove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragError", (long) wxDragError, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragNone", (long) wxDragNone, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragCopy", (long) wxDragCopy, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragMove", (long) wxDragMove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragLink", (long) wxDragLink, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragCancel", (long) wxDragCancel, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -26747,19 +27855,170 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"SYS_OEM_FIXED_FONT", SWIG_PyObj_FromInt((int)wxSYS_OEM_FIXED_FONT)); + PyDict_SetItemString(d,"SYS_ANSI_FIXED_FONT", SWIG_PyObj_FromInt((int)wxSYS_ANSI_FIXED_FONT)); + PyDict_SetItemString(d,"SYS_ANSI_VAR_FONT", SWIG_PyObj_FromInt((int)wxSYS_ANSI_VAR_FONT)); + PyDict_SetItemString(d,"SYS_SYSTEM_FONT", SWIG_PyObj_FromInt((int)wxSYS_SYSTEM_FONT)); + PyDict_SetItemString(d,"SYS_DEVICE_DEFAULT_FONT", SWIG_PyObj_FromInt((int)wxSYS_DEVICE_DEFAULT_FONT)); + PyDict_SetItemString(d,"SYS_DEFAULT_PALETTE", SWIG_PyObj_FromInt((int)wxSYS_DEFAULT_PALETTE)); + PyDict_SetItemString(d,"SYS_SYSTEM_FIXED_FONT", SWIG_PyObj_FromInt((int)wxSYS_SYSTEM_FIXED_FONT)); + PyDict_SetItemString(d,"SYS_DEFAULT_GUI_FONT", SWIG_PyObj_FromInt((int)wxSYS_DEFAULT_GUI_FONT)); + PyDict_SetItemString(d,"SYS_ICONTITLE_FONT", SWIG_PyObj_FromInt((int)wxSYS_ICONTITLE_FONT)); + PyDict_SetItemString(d,"SYS_COLOUR_SCROLLBAR", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_SCROLLBAR)); + PyDict_SetItemString(d,"SYS_COLOUR_BACKGROUND", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BACKGROUND)); + PyDict_SetItemString(d,"SYS_COLOUR_DESKTOP", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_DESKTOP)); + PyDict_SetItemString(d,"SYS_COLOUR_ACTIVECAPTION", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_ACTIVECAPTION)); + PyDict_SetItemString(d,"SYS_COLOUR_INACTIVECAPTION", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INACTIVECAPTION)); + PyDict_SetItemString(d,"SYS_COLOUR_MENU", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MENU)); + PyDict_SetItemString(d,"SYS_COLOUR_WINDOW", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_WINDOW)); + PyDict_SetItemString(d,"SYS_COLOUR_WINDOWFRAME", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_WINDOWFRAME)); + PyDict_SetItemString(d,"SYS_COLOUR_MENUTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MENUTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_WINDOWTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_WINDOWTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_CAPTIONTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_CAPTIONTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_ACTIVEBORDER", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_ACTIVEBORDER)); + PyDict_SetItemString(d,"SYS_COLOUR_INACTIVEBORDER", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INACTIVEBORDER)); + PyDict_SetItemString(d,"SYS_COLOUR_APPWORKSPACE", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_APPWORKSPACE)); + PyDict_SetItemString(d,"SYS_COLOUR_HIGHLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_HIGHLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_HIGHLIGHTTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_HIGHLIGHTTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNFACE", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNFACE)); + PyDict_SetItemString(d,"SYS_COLOUR_3DFACE", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DFACE)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNSHADOW", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNSHADOW)); + PyDict_SetItemString(d,"SYS_COLOUR_3DSHADOW", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DSHADOW)); + PyDict_SetItemString(d,"SYS_COLOUR_GRAYTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_GRAYTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_INACTIVECAPTIONTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INACTIVECAPTIONTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNHIGHLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNHIGHLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNHILIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNHILIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_3DHIGHLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DHIGHLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_3DHILIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DHILIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_3DDKSHADOW", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DDKSHADOW)); + PyDict_SetItemString(d,"SYS_COLOUR_3DLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_INFOTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INFOTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_INFOBK", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INFOBK)); + PyDict_SetItemString(d,"SYS_COLOUR_LISTBOX", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_LISTBOX)); + PyDict_SetItemString(d,"SYS_COLOUR_HOTLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_HOTLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_GRADIENTACTIVECAPTION", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_GRADIENTACTIVECAPTION)); + PyDict_SetItemString(d,"SYS_COLOUR_GRADIENTINACTIVECAPTION", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_GRADIENTINACTIVECAPTION)); + PyDict_SetItemString(d,"SYS_COLOUR_MENUHILIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MENUHILIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_MENUBAR", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MENUBAR)); + PyDict_SetItemString(d,"SYS_COLOUR_MAX", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MAX)); + PyDict_SetItemString(d,"SYS_MOUSE_BUTTONS", SWIG_PyObj_FromInt((int)wxSYS_MOUSE_BUTTONS)); + PyDict_SetItemString(d,"SYS_BORDER_X", SWIG_PyObj_FromInt((int)wxSYS_BORDER_X)); + PyDict_SetItemString(d,"SYS_BORDER_Y", SWIG_PyObj_FromInt((int)wxSYS_BORDER_Y)); + PyDict_SetItemString(d,"SYS_CURSOR_X", SWIG_PyObj_FromInt((int)wxSYS_CURSOR_X)); + PyDict_SetItemString(d,"SYS_CURSOR_Y", SWIG_PyObj_FromInt((int)wxSYS_CURSOR_Y)); + PyDict_SetItemString(d,"SYS_DCLICK_X", SWIG_PyObj_FromInt((int)wxSYS_DCLICK_X)); + PyDict_SetItemString(d,"SYS_DCLICK_Y", SWIG_PyObj_FromInt((int)wxSYS_DCLICK_Y)); + PyDict_SetItemString(d,"SYS_DRAG_X", SWIG_PyObj_FromInt((int)wxSYS_DRAG_X)); + PyDict_SetItemString(d,"SYS_DRAG_Y", SWIG_PyObj_FromInt((int)wxSYS_DRAG_Y)); + PyDict_SetItemString(d,"SYS_EDGE_X", SWIG_PyObj_FromInt((int)wxSYS_EDGE_X)); + PyDict_SetItemString(d,"SYS_EDGE_Y", SWIG_PyObj_FromInt((int)wxSYS_EDGE_Y)); + PyDict_SetItemString(d,"SYS_HSCROLL_ARROW_X", SWIG_PyObj_FromInt((int)wxSYS_HSCROLL_ARROW_X)); + PyDict_SetItemString(d,"SYS_HSCROLL_ARROW_Y", SWIG_PyObj_FromInt((int)wxSYS_HSCROLL_ARROW_Y)); + PyDict_SetItemString(d,"SYS_HTHUMB_X", SWIG_PyObj_FromInt((int)wxSYS_HTHUMB_X)); + PyDict_SetItemString(d,"SYS_ICON_X", SWIG_PyObj_FromInt((int)wxSYS_ICON_X)); + PyDict_SetItemString(d,"SYS_ICON_Y", SWIG_PyObj_FromInt((int)wxSYS_ICON_Y)); + PyDict_SetItemString(d,"SYS_ICONSPACING_X", SWIG_PyObj_FromInt((int)wxSYS_ICONSPACING_X)); + PyDict_SetItemString(d,"SYS_ICONSPACING_Y", SWIG_PyObj_FromInt((int)wxSYS_ICONSPACING_Y)); + PyDict_SetItemString(d,"SYS_WINDOWMIN_X", SWIG_PyObj_FromInt((int)wxSYS_WINDOWMIN_X)); + PyDict_SetItemString(d,"SYS_WINDOWMIN_Y", SWIG_PyObj_FromInt((int)wxSYS_WINDOWMIN_Y)); + PyDict_SetItemString(d,"SYS_SCREEN_X", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_X)); + PyDict_SetItemString(d,"SYS_SCREEN_Y", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_Y)); + PyDict_SetItemString(d,"SYS_FRAMESIZE_X", SWIG_PyObj_FromInt((int)wxSYS_FRAMESIZE_X)); + PyDict_SetItemString(d,"SYS_FRAMESIZE_Y", SWIG_PyObj_FromInt((int)wxSYS_FRAMESIZE_Y)); + PyDict_SetItemString(d,"SYS_SMALLICON_X", SWIG_PyObj_FromInt((int)wxSYS_SMALLICON_X)); + PyDict_SetItemString(d,"SYS_SMALLICON_Y", SWIG_PyObj_FromInt((int)wxSYS_SMALLICON_Y)); + PyDict_SetItemString(d,"SYS_HSCROLL_Y", SWIG_PyObj_FromInt((int)wxSYS_HSCROLL_Y)); + PyDict_SetItemString(d,"SYS_VSCROLL_X", SWIG_PyObj_FromInt((int)wxSYS_VSCROLL_X)); + PyDict_SetItemString(d,"SYS_VSCROLL_ARROW_X", SWIG_PyObj_FromInt((int)wxSYS_VSCROLL_ARROW_X)); + PyDict_SetItemString(d,"SYS_VSCROLL_ARROW_Y", SWIG_PyObj_FromInt((int)wxSYS_VSCROLL_ARROW_Y)); + PyDict_SetItemString(d,"SYS_VTHUMB_Y", SWIG_PyObj_FromInt((int)wxSYS_VTHUMB_Y)); + PyDict_SetItemString(d,"SYS_CAPTION_Y", SWIG_PyObj_FromInt((int)wxSYS_CAPTION_Y)); + PyDict_SetItemString(d,"SYS_MENU_Y", SWIG_PyObj_FromInt((int)wxSYS_MENU_Y)); + PyDict_SetItemString(d,"SYS_NETWORK_PRESENT", SWIG_PyObj_FromInt((int)wxSYS_NETWORK_PRESENT)); + PyDict_SetItemString(d,"SYS_PENWINDOWS_PRESENT", SWIG_PyObj_FromInt((int)wxSYS_PENWINDOWS_PRESENT)); + PyDict_SetItemString(d,"SYS_SHOW_SOUNDS", SWIG_PyObj_FromInt((int)wxSYS_SHOW_SOUNDS)); + PyDict_SetItemString(d,"SYS_SWAP_BUTTONS", SWIG_PyObj_FromInt((int)wxSYS_SWAP_BUTTONS)); + PyDict_SetItemString(d,"SYS_CAN_DRAW_FRAME_DECORATIONS", SWIG_PyObj_FromInt((int)wxSYS_CAN_DRAW_FRAME_DECORATIONS)); + PyDict_SetItemString(d,"SYS_CAN_ICONIZE_FRAME", SWIG_PyObj_FromInt((int)wxSYS_CAN_ICONIZE_FRAME)); + PyDict_SetItemString(d,"SYS_SCREEN_NONE", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_NONE)); + PyDict_SetItemString(d,"SYS_SCREEN_TINY", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_TINY)); + PyDict_SetItemString(d,"SYS_SCREEN_PDA", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_PDA)); + PyDict_SetItemString(d,"SYS_SCREEN_SMALL", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_SMALL)); + PyDict_SetItemString(d,"SYS_SCREEN_DESKTOP", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_DESKTOP)); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorPromptStr",_wrap_FileSelectorPromptStr_get, _wrap_FileSelectorPromptStr_set); SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set); SWIG_addvarlink(SWIG_globals,(char*)"DirSelectorPromptStr",_wrap_DirSelectorPromptStr_get, _wrap_DirSelectorPromptStr_set); + PyDict_SetItemString(d,"SHUTDOWN_POWEROFF", SWIG_PyObj_FromInt((int)wxSHUTDOWN_POWEROFF)); + PyDict_SetItemString(d,"SHUTDOWN_REBOOT", SWIG_PyObj_FromInt((int)wxSHUTDOWN_REBOOT)); + PyDict_SetItemString(d,"TIMER_CONTINUOUS", SWIG_PyObj_FromInt((int)wxTIMER_CONTINUOUS)); + PyDict_SetItemString(d,"TIMER_ONE_SHOT", SWIG_PyObj_FromInt((int)wxTIMER_ONE_SHOT)); PyDict_SetItemString(d, "wxEVT_TIMER", PyInt_FromLong(wxEVT_TIMER)); + PyDict_SetItemString(d,"LOG_FatalError", SWIG_PyObj_FromInt((int)wxLOG_FatalError)); + PyDict_SetItemString(d,"LOG_Error", SWIG_PyObj_FromInt((int)wxLOG_Error)); + PyDict_SetItemString(d,"LOG_Warning", SWIG_PyObj_FromInt((int)wxLOG_Warning)); + PyDict_SetItemString(d,"LOG_Message", SWIG_PyObj_FromInt((int)wxLOG_Message)); + PyDict_SetItemString(d,"LOG_Status", SWIG_PyObj_FromInt((int)wxLOG_Status)); + PyDict_SetItemString(d,"LOG_Info", SWIG_PyObj_FromInt((int)wxLOG_Info)); + PyDict_SetItemString(d,"LOG_Debug", SWIG_PyObj_FromInt((int)wxLOG_Debug)); + PyDict_SetItemString(d,"LOG_Trace", SWIG_PyObj_FromInt((int)wxLOG_Trace)); + PyDict_SetItemString(d,"LOG_Progress", SWIG_PyObj_FromInt((int)wxLOG_Progress)); + PyDict_SetItemString(d,"LOG_User", SWIG_PyObj_FromInt((int)wxLOG_User)); + PyDict_SetItemString(d,"LOG_Max", SWIG_PyObj_FromInt((int)wxLOG_Max)); + PyDict_SetItemString(d,"TraceMemAlloc", SWIG_PyObj_FromInt((int)0x0001)); + PyDict_SetItemString(d,"TraceMessages", SWIG_PyObj_FromInt((int)0x0002)); + PyDict_SetItemString(d,"TraceResAlloc", SWIG_PyObj_FromInt((int)0x0004)); + PyDict_SetItemString(d,"TraceRefCount", SWIG_PyObj_FromInt((int)0x0008)); + PyDict_SetItemString(d,"TraceOleCalls", SWIG_PyObj_FromInt((int)0x0100)); + PyDict_SetItemString(d,"PROCESS_DEFAULT", SWIG_PyObj_FromInt((int)wxPROCESS_DEFAULT)); + PyDict_SetItemString(d,"PROCESS_REDIRECT", SWIG_PyObj_FromInt((int)wxPROCESS_REDIRECT)); + PyDict_SetItemString(d,"KILL_OK", SWIG_PyObj_FromInt((int)wxKILL_OK)); + PyDict_SetItemString(d,"KILL_BAD_SIGNAL", SWIG_PyObj_FromInt((int)wxKILL_BAD_SIGNAL)); + PyDict_SetItemString(d,"KILL_ACCESS_DENIED", SWIG_PyObj_FromInt((int)wxKILL_ACCESS_DENIED)); + PyDict_SetItemString(d,"KILL_NO_PROCESS", SWIG_PyObj_FromInt((int)wxKILL_NO_PROCESS)); + PyDict_SetItemString(d,"KILL_ERROR", SWIG_PyObj_FromInt((int)wxKILL_ERROR)); + PyDict_SetItemString(d,"SIGNONE", SWIG_PyObj_FromInt((int)wxSIGNONE)); + PyDict_SetItemString(d,"SIGHUP", SWIG_PyObj_FromInt((int)wxSIGHUP)); + PyDict_SetItemString(d,"SIGINT", SWIG_PyObj_FromInt((int)wxSIGINT)); + PyDict_SetItemString(d,"SIGQUIT", SWIG_PyObj_FromInt((int)wxSIGQUIT)); + PyDict_SetItemString(d,"SIGILL", SWIG_PyObj_FromInt((int)wxSIGILL)); + PyDict_SetItemString(d,"SIGTRAP", SWIG_PyObj_FromInt((int)wxSIGTRAP)); + PyDict_SetItemString(d,"SIGABRT", SWIG_PyObj_FromInt((int)wxSIGABRT)); + PyDict_SetItemString(d,"SIGIOT", SWIG_PyObj_FromInt((int)wxSIGIOT)); + PyDict_SetItemString(d,"SIGEMT", SWIG_PyObj_FromInt((int)wxSIGEMT)); + PyDict_SetItemString(d,"SIGFPE", SWIG_PyObj_FromInt((int)wxSIGFPE)); + PyDict_SetItemString(d,"SIGKILL", SWIG_PyObj_FromInt((int)wxSIGKILL)); + PyDict_SetItemString(d,"SIGBUS", SWIG_PyObj_FromInt((int)wxSIGBUS)); + PyDict_SetItemString(d,"SIGSEGV", SWIG_PyObj_FromInt((int)wxSIGSEGV)); + PyDict_SetItemString(d,"SIGSYS", SWIG_PyObj_FromInt((int)wxSIGSYS)); + PyDict_SetItemString(d,"SIGPIPE", SWIG_PyObj_FromInt((int)wxSIGPIPE)); + PyDict_SetItemString(d,"SIGALRM", SWIG_PyObj_FromInt((int)wxSIGALRM)); + PyDict_SetItemString(d,"SIGTERM", SWIG_PyObj_FromInt((int)wxSIGTERM)); PyDict_SetItemString(d, "wxEVT_END_PROCESS", PyInt_FromLong(wxEVT_END_PROCESS)); + PyDict_SetItemString(d,"EXEC_ASYNC", SWIG_PyObj_FromInt((int)wxEXEC_ASYNC)); + PyDict_SetItemString(d,"EXEC_SYNC", SWIG_PyObj_FromInt((int)wxEXEC_SYNC)); + PyDict_SetItemString(d,"EXEC_NOHIDE", SWIG_PyObj_FromInt((int)wxEXEC_NOHIDE)); + PyDict_SetItemString(d,"EXEC_MAKE_GROUP_LEADER", SWIG_PyObj_FromInt((int)wxEXEC_MAKE_GROUP_LEADER)); wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess"); + PyDict_SetItemString(d,"JOYSTICK1", SWIG_PyObj_FromInt((int)wxJOYSTICK1)); + PyDict_SetItemString(d,"JOYSTICK2", SWIG_PyObj_FromInt((int)wxJOYSTICK2)); + PyDict_SetItemString(d,"JOY_BUTTON_ANY", SWIG_PyObj_FromInt((int)wxJOY_BUTTON_ANY)); + PyDict_SetItemString(d,"JOY_BUTTON1", SWIG_PyObj_FromInt((int)wxJOY_BUTTON1)); + PyDict_SetItemString(d,"JOY_BUTTON2", SWIG_PyObj_FromInt((int)wxJOY_BUTTON2)); + PyDict_SetItemString(d,"JOY_BUTTON3", SWIG_PyObj_FromInt((int)wxJOY_BUTTON3)); + PyDict_SetItemString(d,"JOY_BUTTON4", SWIG_PyObj_FromInt((int)wxJOY_BUTTON4)); PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_DOWN", PyInt_FromLong(wxEVT_JOY_BUTTON_DOWN)); PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_UP", PyInt_FromLong(wxEVT_JOY_BUTTON_UP)); PyDict_SetItemString(d, "wxEVT_JOY_MOVE", PyInt_FromLong(wxEVT_JOY_MOVE)); PyDict_SetItemString(d, "wxEVT_JOY_ZMOVE", PyInt_FromLong(wxEVT_JOY_ZMOVE)); + PyDict_SetItemString(d,"MAILCAP_STANDARD", SWIG_PyObj_FromInt((int)wxMAILCAP_STANDARD)); + PyDict_SetItemString(d,"MAILCAP_NETSCAPE", SWIG_PyObj_FromInt((int)wxMAILCAP_NETSCAPE)); + PyDict_SetItemString(d,"MAILCAP_KDE", SWIG_PyObj_FromInt((int)wxMAILCAP_KDE)); + PyDict_SetItemString(d,"MAILCAP_GNOME", SWIG_PyObj_FromInt((int)wxMAILCAP_GNOME)); + PyDict_SetItemString(d,"MAILCAP_ALL", SWIG_PyObj_FromInt((int)wxMAILCAP_ALL)); SWIG_addvarlink(SWIG_globals,(char*)"TheMimeTypesManager",_wrap_TheMimeTypesManager_get, _wrap_TheMimeTypesManager_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_TOOLBAR",_wrap_ART_TOOLBAR_get, _wrap_ART_TOOLBAR_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_MENU",_wrap_ART_MENU_get, _wrap_ART_MENU_set); @@ -26802,9 +28061,205 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider"); + PyDict_SetItemString(d,"CONFIG_USE_LOCAL_FILE", SWIG_PyObj_FromInt((int)wxCONFIG_USE_LOCAL_FILE)); + PyDict_SetItemString(d,"CONFIG_USE_GLOBAL_FILE", SWIG_PyObj_FromInt((int)wxCONFIG_USE_GLOBAL_FILE)); + PyDict_SetItemString(d,"CONFIG_USE_RELATIVE_PATH", SWIG_PyObj_FromInt((int)wxCONFIG_USE_RELATIVE_PATH)); + PyDict_SetItemString(d,"CONFIG_USE_NO_ESCAPE_CHARACTERS", SWIG_PyObj_FromInt((int)wxCONFIG_USE_NO_ESCAPE_CHARACTERS)); + PyDict_SetItemString(d,"ConfigBase_Type_Unknown", SWIG_PyObj_FromInt((int)wxConfigBase::Type_Unknown)); + PyDict_SetItemString(d,"ConfigBase_Type_String", SWIG_PyObj_FromInt((int)wxConfigBase::Type_String)); + PyDict_SetItemString(d,"ConfigBase_Type_Boolean", SWIG_PyObj_FromInt((int)wxConfigBase::Type_Boolean)); + PyDict_SetItemString(d,"ConfigBase_Type_Integer", SWIG_PyObj_FromInt((int)wxConfigBase::Type_Integer)); + PyDict_SetItemString(d,"ConfigBase_Type_Float", SWIG_PyObj_FromInt((int)wxConfigBase::Type_Float)); SWIG_addvarlink(SWIG_globals,(char*)"DateFormatStr",_wrap_DateFormatStr_get, _wrap_DateFormatStr_set); SWIG_addvarlink(SWIG_globals,(char*)"TimeSpanFormatStr",_wrap_TimeSpanFormatStr_get, _wrap_TimeSpanFormatStr_set); + PyDict_SetItemString(d,"DateTime_Local", SWIG_PyObj_FromInt((int)wxDateTime::Local)); + PyDict_SetItemString(d,"DateTime_GMT_12", SWIG_PyObj_FromInt((int)wxDateTime::GMT_12)); + PyDict_SetItemString(d,"DateTime_GMT_11", SWIG_PyObj_FromInt((int)wxDateTime::GMT_11)); + PyDict_SetItemString(d,"DateTime_GMT_10", SWIG_PyObj_FromInt((int)wxDateTime::GMT_10)); + PyDict_SetItemString(d,"DateTime_GMT_9", SWIG_PyObj_FromInt((int)wxDateTime::GMT_9)); + PyDict_SetItemString(d,"DateTime_GMT_8", SWIG_PyObj_FromInt((int)wxDateTime::GMT_8)); + PyDict_SetItemString(d,"DateTime_GMT_7", SWIG_PyObj_FromInt((int)wxDateTime::GMT_7)); + PyDict_SetItemString(d,"DateTime_GMT_6", SWIG_PyObj_FromInt((int)wxDateTime::GMT_6)); + PyDict_SetItemString(d,"DateTime_GMT_5", SWIG_PyObj_FromInt((int)wxDateTime::GMT_5)); + PyDict_SetItemString(d,"DateTime_GMT_4", SWIG_PyObj_FromInt((int)wxDateTime::GMT_4)); + PyDict_SetItemString(d,"DateTime_GMT_3", SWIG_PyObj_FromInt((int)wxDateTime::GMT_3)); + PyDict_SetItemString(d,"DateTime_GMT_2", SWIG_PyObj_FromInt((int)wxDateTime::GMT_2)); + PyDict_SetItemString(d,"DateTime_GMT_1", SWIG_PyObj_FromInt((int)wxDateTime::GMT_1)); + PyDict_SetItemString(d,"DateTime_GMT0", SWIG_PyObj_FromInt((int)wxDateTime::GMT0)); + PyDict_SetItemString(d,"DateTime_GMT1", SWIG_PyObj_FromInt((int)wxDateTime::GMT1)); + PyDict_SetItemString(d,"DateTime_GMT2", SWIG_PyObj_FromInt((int)wxDateTime::GMT2)); + PyDict_SetItemString(d,"DateTime_GMT3", SWIG_PyObj_FromInt((int)wxDateTime::GMT3)); + PyDict_SetItemString(d,"DateTime_GMT4", SWIG_PyObj_FromInt((int)wxDateTime::GMT4)); + PyDict_SetItemString(d,"DateTime_GMT5", SWIG_PyObj_FromInt((int)wxDateTime::GMT5)); + PyDict_SetItemString(d,"DateTime_GMT6", SWIG_PyObj_FromInt((int)wxDateTime::GMT6)); + PyDict_SetItemString(d,"DateTime_GMT7", SWIG_PyObj_FromInt((int)wxDateTime::GMT7)); + PyDict_SetItemString(d,"DateTime_GMT8", SWIG_PyObj_FromInt((int)wxDateTime::GMT8)); + PyDict_SetItemString(d,"DateTime_GMT9", SWIG_PyObj_FromInt((int)wxDateTime::GMT9)); + PyDict_SetItemString(d,"DateTime_GMT10", SWIG_PyObj_FromInt((int)wxDateTime::GMT10)); + PyDict_SetItemString(d,"DateTime_GMT11", SWIG_PyObj_FromInt((int)wxDateTime::GMT11)); + PyDict_SetItemString(d,"DateTime_GMT12", SWIG_PyObj_FromInt((int)wxDateTime::GMT12)); + PyDict_SetItemString(d,"DateTime_WET", SWIG_PyObj_FromInt((int)wxDateTime::WET)); + PyDict_SetItemString(d,"DateTime_WEST", SWIG_PyObj_FromInt((int)wxDateTime::WEST)); + PyDict_SetItemString(d,"DateTime_CET", SWIG_PyObj_FromInt((int)wxDateTime::CET)); + PyDict_SetItemString(d,"DateTime_CEST", SWIG_PyObj_FromInt((int)wxDateTime::CEST)); + PyDict_SetItemString(d,"DateTime_EET", SWIG_PyObj_FromInt((int)wxDateTime::EET)); + PyDict_SetItemString(d,"DateTime_EEST", SWIG_PyObj_FromInt((int)wxDateTime::EEST)); + PyDict_SetItemString(d,"DateTime_MSK", SWIG_PyObj_FromInt((int)wxDateTime::MSK)); + PyDict_SetItemString(d,"DateTime_MSD", SWIG_PyObj_FromInt((int)wxDateTime::MSD)); + PyDict_SetItemString(d,"DateTime_AST", SWIG_PyObj_FromInt((int)wxDateTime::AST)); + PyDict_SetItemString(d,"DateTime_ADT", SWIG_PyObj_FromInt((int)wxDateTime::ADT)); + PyDict_SetItemString(d,"DateTime_EST", SWIG_PyObj_FromInt((int)wxDateTime::EST)); + PyDict_SetItemString(d,"DateTime_EDT", SWIG_PyObj_FromInt((int)wxDateTime::EDT)); + PyDict_SetItemString(d,"DateTime_CST", SWIG_PyObj_FromInt((int)wxDateTime::CST)); + PyDict_SetItemString(d,"DateTime_CDT", SWIG_PyObj_FromInt((int)wxDateTime::CDT)); + PyDict_SetItemString(d,"DateTime_MST", SWIG_PyObj_FromInt((int)wxDateTime::MST)); + PyDict_SetItemString(d,"DateTime_MDT", SWIG_PyObj_FromInt((int)wxDateTime::MDT)); + PyDict_SetItemString(d,"DateTime_PST", SWIG_PyObj_FromInt((int)wxDateTime::PST)); + PyDict_SetItemString(d,"DateTime_PDT", SWIG_PyObj_FromInt((int)wxDateTime::PDT)); + PyDict_SetItemString(d,"DateTime_HST", SWIG_PyObj_FromInt((int)wxDateTime::HST)); + PyDict_SetItemString(d,"DateTime_AKST", SWIG_PyObj_FromInt((int)wxDateTime::AKST)); + PyDict_SetItemString(d,"DateTime_AKDT", SWIG_PyObj_FromInt((int)wxDateTime::AKDT)); + PyDict_SetItemString(d,"DateTime_A_WST", SWIG_PyObj_FromInt((int)wxDateTime::A_WST)); + PyDict_SetItemString(d,"DateTime_A_CST", SWIG_PyObj_FromInt((int)wxDateTime::A_CST)); + PyDict_SetItemString(d,"DateTime_A_EST", SWIG_PyObj_FromInt((int)wxDateTime::A_EST)); + PyDict_SetItemString(d,"DateTime_A_ESST", SWIG_PyObj_FromInt((int)wxDateTime::A_ESST)); + PyDict_SetItemString(d,"DateTime_UTC", SWIG_PyObj_FromInt((int)wxDateTime::UTC)); + PyDict_SetItemString(d,"DateTime_Gregorian", SWIG_PyObj_FromInt((int)wxDateTime::Gregorian)); + PyDict_SetItemString(d,"DateTime_Julian", SWIG_PyObj_FromInt((int)wxDateTime::Julian)); + PyDict_SetItemString(d,"DateTime_Gr_Unknown", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Unknown)); + PyDict_SetItemString(d,"DateTime_Gr_Standard", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Standard)); + PyDict_SetItemString(d,"DateTime_Gr_Alaska", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Alaska)); + PyDict_SetItemString(d,"DateTime_Gr_Albania", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Albania)); + PyDict_SetItemString(d,"DateTime_Gr_Austria", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Brixen", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Brixen)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Salzburg", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Salzburg)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Tyrol", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Tyrol)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Carinthia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Carinthia)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Styria", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Styria)); + PyDict_SetItemString(d,"DateTime_Gr_Belgium", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Belgium)); + PyDict_SetItemString(d,"DateTime_Gr_Bulgaria", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Bulgaria)); + PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_1", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Bulgaria_1)); + PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_2", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Bulgaria_2)); + PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_3", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Bulgaria_3)); + PyDict_SetItemString(d,"DateTime_Gr_Canada", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Canada)); + PyDict_SetItemString(d,"DateTime_Gr_China", SWIG_PyObj_FromInt((int)wxDateTime::Gr_China)); + PyDict_SetItemString(d,"DateTime_Gr_China_1", SWIG_PyObj_FromInt((int)wxDateTime::Gr_China_1)); + PyDict_SetItemString(d,"DateTime_Gr_China_2", SWIG_PyObj_FromInt((int)wxDateTime::Gr_China_2)); + PyDict_SetItemString(d,"DateTime_Gr_Czechoslovakia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Czechoslovakia)); + PyDict_SetItemString(d,"DateTime_Gr_Denmark", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Denmark)); + PyDict_SetItemString(d,"DateTime_Gr_Egypt", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Egypt)); + PyDict_SetItemString(d,"DateTime_Gr_Estonia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Estonia)); + PyDict_SetItemString(d,"DateTime_Gr_Finland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Finland)); + PyDict_SetItemString(d,"DateTime_Gr_France", SWIG_PyObj_FromInt((int)wxDateTime::Gr_France)); + PyDict_SetItemString(d,"DateTime_Gr_France_Alsace", SWIG_PyObj_FromInt((int)wxDateTime::Gr_France_Alsace)); + PyDict_SetItemString(d,"DateTime_Gr_France_Lorraine", SWIG_PyObj_FromInt((int)wxDateTime::Gr_France_Lorraine)); + PyDict_SetItemString(d,"DateTime_Gr_France_Strasbourg", SWIG_PyObj_FromInt((int)wxDateTime::Gr_France_Strasbourg)); + PyDict_SetItemString(d,"DateTime_Gr_Germany", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Germany)); + PyDict_SetItemString(d,"DateTime_Gr_Germany_Catholic", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Germany_Catholic)); + PyDict_SetItemString(d,"DateTime_Gr_Germany_Prussia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Germany_Prussia)); + PyDict_SetItemString(d,"DateTime_Gr_Germany_Protestant", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Germany_Protestant)); + PyDict_SetItemString(d,"DateTime_Gr_GreatBritain", SWIG_PyObj_FromInt((int)wxDateTime::Gr_GreatBritain)); + PyDict_SetItemString(d,"DateTime_Gr_Greece", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Greece)); + PyDict_SetItemString(d,"DateTime_Gr_Hungary", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Hungary)); + PyDict_SetItemString(d,"DateTime_Gr_Ireland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Ireland)); + PyDict_SetItemString(d,"DateTime_Gr_Italy", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Italy)); + PyDict_SetItemString(d,"DateTime_Gr_Japan", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Japan)); + PyDict_SetItemString(d,"DateTime_Gr_Japan_1", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Japan_1)); + PyDict_SetItemString(d,"DateTime_Gr_Japan_2", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Japan_2)); + PyDict_SetItemString(d,"DateTime_Gr_Japan_3", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Japan_3)); + PyDict_SetItemString(d,"DateTime_Gr_Latvia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Latvia)); + PyDict_SetItemString(d,"DateTime_Gr_Lithuania", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Lithuania)); + PyDict_SetItemString(d,"DateTime_Gr_Luxemburg", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Luxemburg)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Groningen", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands_Groningen)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Gelderland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands_Gelderland)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Utrecht", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands_Utrecht)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Friesland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands_Friesland)); + PyDict_SetItemString(d,"DateTime_Gr_Norway", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Norway)); + PyDict_SetItemString(d,"DateTime_Gr_Poland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Poland)); + PyDict_SetItemString(d,"DateTime_Gr_Portugal", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Portugal)); + PyDict_SetItemString(d,"DateTime_Gr_Romania", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Romania)); + PyDict_SetItemString(d,"DateTime_Gr_Russia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Russia)); + PyDict_SetItemString(d,"DateTime_Gr_Scotland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Scotland)); + PyDict_SetItemString(d,"DateTime_Gr_Spain", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Spain)); + PyDict_SetItemString(d,"DateTime_Gr_Sweden", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Sweden)); + PyDict_SetItemString(d,"DateTime_Gr_Switzerland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Switzerland)); + PyDict_SetItemString(d,"DateTime_Gr_Switzerland_Catholic", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Switzerland_Catholic)); + PyDict_SetItemString(d,"DateTime_Gr_Switzerland_Protestant", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Switzerland_Protestant)); + PyDict_SetItemString(d,"DateTime_Gr_Turkey", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Turkey)); + PyDict_SetItemString(d,"DateTime_Gr_USA", SWIG_PyObj_FromInt((int)wxDateTime::Gr_USA)); + PyDict_SetItemString(d,"DateTime_Gr_Wales", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Wales)); + PyDict_SetItemString(d,"DateTime_Gr_Yugoslavia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Yugoslavia)); + PyDict_SetItemString(d,"DateTime_Country_Unknown", SWIG_PyObj_FromInt((int)wxDateTime::Country_Unknown)); + PyDict_SetItemString(d,"DateTime_Country_Default", SWIG_PyObj_FromInt((int)wxDateTime::Country_Default)); + PyDict_SetItemString(d,"DateTime_Country_WesternEurope_Start", SWIG_PyObj_FromInt((int)wxDateTime::Country_WesternEurope_Start)); + PyDict_SetItemString(d,"DateTime_Country_EEC", SWIG_PyObj_FromInt((int)wxDateTime::Country_EEC)); + PyDict_SetItemString(d,"DateTime_France", SWIG_PyObj_FromInt((int)wxDateTime::France)); + PyDict_SetItemString(d,"DateTime_Germany", SWIG_PyObj_FromInt((int)wxDateTime::Germany)); + PyDict_SetItemString(d,"DateTime_UK", SWIG_PyObj_FromInt((int)wxDateTime::UK)); + PyDict_SetItemString(d,"DateTime_Country_WesternEurope_End", SWIG_PyObj_FromInt((int)wxDateTime::Country_WesternEurope_End)); + PyDict_SetItemString(d,"DateTime_Russia", SWIG_PyObj_FromInt((int)wxDateTime::Russia)); + PyDict_SetItemString(d,"DateTime_USA", SWIG_PyObj_FromInt((int)wxDateTime::USA)); + PyDict_SetItemString(d,"DateTime_Jan", SWIG_PyObj_FromInt((int)wxDateTime::Jan)); + PyDict_SetItemString(d,"DateTime_Feb", SWIG_PyObj_FromInt((int)wxDateTime::Feb)); + PyDict_SetItemString(d,"DateTime_Mar", SWIG_PyObj_FromInt((int)wxDateTime::Mar)); + PyDict_SetItemString(d,"DateTime_Apr", SWIG_PyObj_FromInt((int)wxDateTime::Apr)); + PyDict_SetItemString(d,"DateTime_May", SWIG_PyObj_FromInt((int)wxDateTime::May)); + PyDict_SetItemString(d,"DateTime_Jun", SWIG_PyObj_FromInt((int)wxDateTime::Jun)); + PyDict_SetItemString(d,"DateTime_Jul", SWIG_PyObj_FromInt((int)wxDateTime::Jul)); + PyDict_SetItemString(d,"DateTime_Aug", SWIG_PyObj_FromInt((int)wxDateTime::Aug)); + PyDict_SetItemString(d,"DateTime_Sep", SWIG_PyObj_FromInt((int)wxDateTime::Sep)); + PyDict_SetItemString(d,"DateTime_Oct", SWIG_PyObj_FromInt((int)wxDateTime::Oct)); + PyDict_SetItemString(d,"DateTime_Nov", SWIG_PyObj_FromInt((int)wxDateTime::Nov)); + PyDict_SetItemString(d,"DateTime_Dec", SWIG_PyObj_FromInt((int)wxDateTime::Dec)); + PyDict_SetItemString(d,"DateTime_Inv_Month", SWIG_PyObj_FromInt((int)wxDateTime::Inv_Month)); + PyDict_SetItemString(d,"DateTime_Sun", SWIG_PyObj_FromInt((int)wxDateTime::Sun)); + PyDict_SetItemString(d,"DateTime_Mon", SWIG_PyObj_FromInt((int)wxDateTime::Mon)); + PyDict_SetItemString(d,"DateTime_Tue", SWIG_PyObj_FromInt((int)wxDateTime::Tue)); + PyDict_SetItemString(d,"DateTime_Wed", SWIG_PyObj_FromInt((int)wxDateTime::Wed)); + PyDict_SetItemString(d,"DateTime_Thu", SWIG_PyObj_FromInt((int)wxDateTime::Thu)); + PyDict_SetItemString(d,"DateTime_Fri", SWIG_PyObj_FromInt((int)wxDateTime::Fri)); + PyDict_SetItemString(d,"DateTime_Sat", SWIG_PyObj_FromInt((int)wxDateTime::Sat)); + PyDict_SetItemString(d,"DateTime_Inv_WeekDay", SWIG_PyObj_FromInt((int)wxDateTime::Inv_WeekDay)); + PyDict_SetItemString(d,"DateTime_Inv_Year", SWIG_PyObj_FromInt((int)wxDateTime::Inv_Year)); + PyDict_SetItemString(d,"DateTime_Name_Full", SWIG_PyObj_FromInt((int)wxDateTime::Name_Full)); + PyDict_SetItemString(d,"DateTime_Name_Abbr", SWIG_PyObj_FromInt((int)wxDateTime::Name_Abbr)); + PyDict_SetItemString(d,"DateTime_Default_First", SWIG_PyObj_FromInt((int)wxDateTime::Default_First)); + PyDict_SetItemString(d,"DateTime_Monday_First", SWIG_PyObj_FromInt((int)wxDateTime::Monday_First)); + PyDict_SetItemString(d,"DateTime_Sunday_First", SWIG_PyObj_FromInt((int)wxDateTime::Sunday_First)); + PyDict_SetItemString(d,"DF_INVALID", SWIG_PyObj_FromInt((int)wxDF_INVALID)); + PyDict_SetItemString(d,"DF_TEXT", SWIG_PyObj_FromInt((int)wxDF_TEXT)); + PyDict_SetItemString(d,"DF_BITMAP", SWIG_PyObj_FromInt((int)wxDF_BITMAP)); + PyDict_SetItemString(d,"DF_METAFILE", SWIG_PyObj_FromInt((int)wxDF_METAFILE)); + PyDict_SetItemString(d,"DF_SYLK", SWIG_PyObj_FromInt((int)wxDF_SYLK)); + PyDict_SetItemString(d,"DF_DIF", SWIG_PyObj_FromInt((int)wxDF_DIF)); + PyDict_SetItemString(d,"DF_TIFF", SWIG_PyObj_FromInt((int)wxDF_TIFF)); + PyDict_SetItemString(d,"DF_OEMTEXT", SWIG_PyObj_FromInt((int)wxDF_OEMTEXT)); + PyDict_SetItemString(d,"DF_DIB", SWIG_PyObj_FromInt((int)wxDF_DIB)); + PyDict_SetItemString(d,"DF_PALETTE", SWIG_PyObj_FromInt((int)wxDF_PALETTE)); + PyDict_SetItemString(d,"DF_PENDATA", SWIG_PyObj_FromInt((int)wxDF_PENDATA)); + PyDict_SetItemString(d,"DF_RIFF", SWIG_PyObj_FromInt((int)wxDF_RIFF)); + PyDict_SetItemString(d,"DF_WAVE", SWIG_PyObj_FromInt((int)wxDF_WAVE)); + PyDict_SetItemString(d,"DF_UNICODETEXT", SWIG_PyObj_FromInt((int)wxDF_UNICODETEXT)); + PyDict_SetItemString(d,"DF_ENHMETAFILE", SWIG_PyObj_FromInt((int)wxDF_ENHMETAFILE)); + PyDict_SetItemString(d,"DF_FILENAME", SWIG_PyObj_FromInt((int)wxDF_FILENAME)); + PyDict_SetItemString(d,"DF_LOCALE", SWIG_PyObj_FromInt((int)wxDF_LOCALE)); + PyDict_SetItemString(d,"DF_PRIVATE", SWIG_PyObj_FromInt((int)wxDF_PRIVATE)); + PyDict_SetItemString(d,"DF_HTML", SWIG_PyObj_FromInt((int)wxDF_HTML)); + PyDict_SetItemString(d,"DF_MAX", SWIG_PyObj_FromInt((int)wxDF_MAX)); SWIG_addvarlink(SWIG_globals,(char*)"FormatInvalid",_wrap_FormatInvalid_get, _wrap_FormatInvalid_set); + PyDict_SetItemString(d,"DataObject_Get", SWIG_PyObj_FromInt((int)wxDataObject::Get)); + PyDict_SetItemString(d,"DataObject_Set", SWIG_PyObj_FromInt((int)wxDataObject::Set)); + PyDict_SetItemString(d,"DataObject_Both", SWIG_PyObj_FromInt((int)wxDataObject::Both)); + PyDict_SetItemString(d,"Drag_CopyOnly", SWIG_PyObj_FromInt((int)wxDrag_CopyOnly)); + PyDict_SetItemString(d,"Drag_AllowMove", SWIG_PyObj_FromInt((int)wxDrag_AllowMove)); + PyDict_SetItemString(d,"Drag_DefaultMove", SWIG_PyObj_FromInt((int)wxDrag_DefaultMove)); + PyDict_SetItemString(d,"DragError", SWIG_PyObj_FromInt((int)wxDragError)); + PyDict_SetItemString(d,"DragNone", SWIG_PyObj_FromInt((int)wxDragNone)); + PyDict_SetItemString(d,"DragCopy", SWIG_PyObj_FromInt((int)wxDragCopy)); + PyDict_SetItemString(d,"DragMove", SWIG_PyObj_FromInt((int)wxDragMove)); + PyDict_SetItemString(d,"DragLink", SWIG_PyObj_FromInt((int)wxDragLink)); + PyDict_SetItemString(d,"DragCancel", SWIG_PyObj_FromInt((int)wxDragCancel)); wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource"); wxPyPtrTypeMap_Add("wxDropTarget", "wxPyDropTarget"); diff --git a/wxPython/src/mac/windows.py b/wxPython/src/mac/windows.py index 04bd99d05d..8d229b3f54 100644 --- a/wxPython/src/mac/windows.py +++ b/wxPython/src/mac/windows.py @@ -658,9 +658,10 @@ class SplitterWindow(core.Window): return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, Point point=DefaultPosition, - Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow + __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow """ + if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'] newobj = _windows.new_SplitterWindow(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -669,8 +670,8 @@ class SplitterWindow(core.Window): def Create(*args, **kwargs): """ - Create(Window parent, int id, Point point=DefaultPosition, - Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> bool + Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=SP_3D, String name=SplitterNameStr) -> bool """ return _windows.SplitterWindow_Create(*args, **kwargs) diff --git a/wxPython/src/mac/windows_wrap.cpp b/wxPython/src/mac/windows_wrap.cpp index 557f15225f..ba0d60c754 100644 --- a/wxPython/src/mac/windows_wrap.cpp +++ b/wxPython/src/mac/windows_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -421,49 +270,50 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPyHtmlListBox swig_types[37] #define SWIGTYPE_p_wxPyVListBox swig_types[38] #define SWIGTYPE_p_wxRect swig_types[39] -#define SWIGTYPE_p_wxMiniFrame swig_types[40] -#define SWIGTYPE_p_wxFrame swig_types[41] -#define SWIGTYPE_p_wxPyPrintout swig_types[42] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[43] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[44] -#define SWIGTYPE_p_wxStatusBar swig_types[45] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[46] -#define SWIGTYPE_p_wxPoint swig_types[47] -#define SWIGTYPE_p_wxObject swig_types[48] -#define SWIGTYPE_p_unsigned_long swig_types[49] -#define SWIGTYPE_p_wxMDIClientWindow swig_types[50] -#define SWIGTYPE_p_wxTipWindow swig_types[51] -#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[52] -#define SWIGTYPE_p_wxSashLayoutWindow swig_types[53] -#define SWIGTYPE_p_wxSplitterWindow swig_types[54] -#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[55] -#define SWIGTYPE_p_wxPopupWindow swig_types[56] -#define SWIGTYPE_p_wxSashWindow swig_types[57] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[58] -#define SWIGTYPE_p_wxWindow swig_types[59] -#define SWIGTYPE_p_wxScrolledWindow swig_types[60] -#define SWIGTYPE_p_wxSplashScreenWindow swig_types[61] -#define SWIGTYPE_p_wxMenuBar swig_types[62] -#define SWIGTYPE_p_wxPrintPreview swig_types[63] -#define SWIGTYPE_p_wxSashEvent swig_types[64] -#define SWIGTYPE_p_wxString swig_types[65] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[66] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[67] -#define SWIGTYPE_p_wxFontDialog swig_types[68] -#define SWIGTYPE_p_wxDirDialog swig_types[69] -#define SWIGTYPE_p_wxColourDialog swig_types[70] -#define SWIGTYPE_p_wxDialog swig_types[71] -#define SWIGTYPE_p_wxPanel swig_types[72] -#define SWIGTYPE_p_wxPrintDialog swig_types[73] -#define SWIGTYPE_p_wxBitmap swig_types[74] -#define SWIGTYPE_p_wxCommandEvent swig_types[75] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[76] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[77] -#define SWIGTYPE_p_wxColour swig_types[78] -#define SWIGTYPE_p_wxToolBar swig_types[79] -#define SWIGTYPE_p_wxPrintDialogData swig_types[80] +#define SWIGTYPE_p_char swig_types[40] +#define SWIGTYPE_p_wxMiniFrame swig_types[41] +#define SWIGTYPE_p_wxFrame swig_types[42] +#define SWIGTYPE_p_wxPyPrintout swig_types[43] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[44] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[45] +#define SWIGTYPE_p_wxStatusBar swig_types[46] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[47] +#define SWIGTYPE_p_wxPoint swig_types[48] +#define SWIGTYPE_p_wxObject swig_types[49] +#define SWIGTYPE_p_unsigned_long swig_types[50] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[51] +#define SWIGTYPE_p_wxTipWindow swig_types[52] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[53] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[54] +#define SWIGTYPE_p_wxSplitterWindow swig_types[55] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[56] +#define SWIGTYPE_p_wxPopupWindow swig_types[57] +#define SWIGTYPE_p_wxSashWindow swig_types[58] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[59] +#define SWIGTYPE_p_wxWindow swig_types[60] +#define SWIGTYPE_p_wxScrolledWindow swig_types[61] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[62] +#define SWIGTYPE_p_wxMenuBar swig_types[63] +#define SWIGTYPE_p_wxPrintPreview swig_types[64] +#define SWIGTYPE_p_wxSashEvent swig_types[65] +#define SWIGTYPE_p_wxString swig_types[66] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[67] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[68] +#define SWIGTYPE_p_wxFontDialog swig_types[69] +#define SWIGTYPE_p_wxDirDialog swig_types[70] +#define SWIGTYPE_p_wxColourDialog swig_types[71] +#define SWIGTYPE_p_wxDialog swig_types[72] +#define SWIGTYPE_p_wxPanel swig_types[73] +#define SWIGTYPE_p_wxPrintDialog swig_types[74] +#define SWIGTYPE_p_wxBitmap swig_types[75] +#define SWIGTYPE_p_wxCommandEvent swig_types[76] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[77] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[78] +#define SWIGTYPE_p_wxColour swig_types[79] +#define SWIGTYPE_p_wxToolBar swig_types[80] #define SWIGTYPE_p_wxPageSetupDialogData swig_types[81] -static swig_type_info *swig_types[83]; +#define SWIGTYPE_p_wxPrintDialogData swig_types[82] +static swig_type_info *swig_types[84]; /* -------- TYPES TABLE (END) -------- */ @@ -475,6 +325,44 @@ static swig_type_info *swig_types[83]; #define SWIG_name "_windows" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" @@ -484,6 +372,37 @@ static swig_type_info *swig_types[83]; +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -510,6 +429,22 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + static const wxString wxPyFrameNameStr(wxFrameNameStr); static const wxString wxPyDialogNameStr(wxDialogNameStr); static const wxString wxPyStatusLineNameStr(wxStatusLineNameStr); @@ -634,6 +569,14 @@ IMP_PYCALLBACK_VOID_SIZETSIZET_const(wxPyVScrolledWindow, wxVScrolledWindow, OnG IMP_PYCALLBACK_COORD_const (wxPyVScrolledWindow, wxVScrolledWindow, EstimateTotalHeight); +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + #include static const wxString wxPyVListBoxNameStr(wxVListBoxNameStr); @@ -1155,15 +1098,23 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg 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 *)"O|iOOlO:new_Panel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Panel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1176,6 +1127,12 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -1245,16 +1202,22 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Panel_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Panel_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -1267,6 +1230,12 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1281,7 +1250,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -1343,15 +1312,23 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje 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 *)"O|iOOlO:new_ScrolledWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_ScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1364,6 +1341,12 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -1433,16 +1416,24 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:ScrolledWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:ScrolledWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -1455,6 +1446,12 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1469,7 +1466,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -1495,16 +1492,50 @@ static PyObject *_wrap_ScrolledWindow_SetScrollbars(PyObject *self, PyObject *ar int arg7 = (int) 0 ; bool arg8 = (bool) 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 *) "pixelsPerUnitX",(char *) "pixelsPerUnitY",(char *) "noUnitsX",(char *) "noUnitsY",(char *) "xPos",(char *) "yPos",(char *) "noRefresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|iiO:ScrolledWindow_SetScrollbars",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:ScrolledWindow_SetScrollbars",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { - arg8 = (bool) SPyObj_AsBool(obj7); + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } } @@ -1528,12 +1559,22 @@ static PyObject *_wrap_ScrolledWindow_Scroll(PyObject *self, PyObject *args, PyO int arg2 ; int 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 *)"Oii:ScrolledWindow_Scroll",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_Scroll",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scroll(arg2,arg3); @@ -1554,12 +1595,17 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrolledWindow_GetScrollPageSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrolledWindow_GetScrollPageSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxScrolledWindow const *)arg1)->GetScrollPageSize(arg2); @@ -1567,7 +1613,7 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1580,12 +1626,22 @@ static PyObject *_wrap_ScrolledWindow_SetScrollPageSize(PyObject *self, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient",(char *) "pageSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ScrolledWindow_SetScrollPageSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScrollPageSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScrollPageSize(arg2,arg3); @@ -1606,12 +1662,22 @@ static PyObject *_wrap_ScrolledWindow_SetScrollRate(PyObject *self, PyObject *ar int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xstep",(char *) "ystep", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ScrolledWindow_SetScrollRate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScrollRate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScrollRate(arg2,arg3); @@ -1679,11 +1745,11 @@ static PyObject *_wrap_ScrolledWindow_EnableScrolling(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_EnableScrolling",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -1744,12 +1810,22 @@ static PyObject *_wrap_ScrolledWindow_SetScale(PyObject *self, PyObject *args, P double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xs",(char *) "ys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ScrolledWindow_SetScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScale(arg2,arg3); @@ -1782,7 +1858,7 @@ static PyObject *_wrap_ScrolledWindow_GetScaleX(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1807,7 +1883,7 @@ static PyObject *_wrap_ScrolledWindow_GetScaleY(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1857,11 +1933,21 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(PyObject *sel int temp4 ; int temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTuple(args,(char *)"Oii:ScrolledWindow_CalcScrolledPosition",&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:ScrolledWindow_CalcScrolledPosition",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxScrolledWindow const *)arg1)->CalcScrolledPosition(arg2,arg3,arg4,arg5); @@ -1926,7 +2012,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -1936,7 +2022,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj } if (_v) { { - SPyObj_AsInt(argv[2]); + SWIG_PyObj_AsInt(argv[2]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -1999,11 +2085,21 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(PyObject *s int temp4 ; int temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTuple(args,(char *)"Oii:ScrolledWindow_CalcUnscrolledPosition",&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:ScrolledWindow_CalcUnscrolledPosition",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxScrolledWindow const *)arg1)->CalcUnscrolledPosition(arg2,arg3,arg4,arg5); @@ -2068,7 +2164,7 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -2078,7 +2174,7 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO } if (_v) { { - SPyObj_AsInt(argv[2]); + SWIG_PyObj_AsInt(argv[2]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -2146,7 +2242,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrollInc(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2274,7 +2370,7 @@ static PyObject * ScrolledWindow_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_FrameNameStr_set(PyObject *_val) { +static int _wrap_FrameNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FrameNameStr is read-only."); return 1; } @@ -2294,7 +2390,7 @@ static PyObject *_wrap_FrameNameStr_get() { } -static int _wrap_DialogNameStr_set(PyObject *_val) { +static int _wrap_DialogNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DialogNameStr is read-only."); return 1; } @@ -2314,7 +2410,7 @@ static PyObject *_wrap_DialogNameStr_get() { } -static int _wrap_StatusLineNameStr_set(PyObject *_val) { +static int _wrap_StatusLineNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StatusLineNameStr is read-only."); return 1; } @@ -2334,7 +2430,7 @@ static PyObject *_wrap_StatusLineNameStr_get() { } -static int _wrap_ToolBarNameStr_set(PyObject *_val) { +static int _wrap_ToolBarNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ToolBarNameStr is read-only."); return 1; } @@ -2368,7 +2464,7 @@ static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -2424,7 +2520,7 @@ static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -2460,7 +2556,7 @@ static PyObject *_wrap_TopLevelWindow_IsMaximized(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2485,7 +2581,7 @@ static PyObject *_wrap_TopLevelWindow_IsIconized(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2589,16 +2685,23 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "show",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:TopLevelWindow_ShowFullScreen",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TopLevelWindow_ShowFullScreen",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ShowFullScreen(arg2,arg3); @@ -2606,7 +2709,7 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2631,7 +2734,7 @@ static PyObject *_wrap_TopLevelWindow_IsFullScreen(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2733,7 +2836,7 @@ static PyObject *_wrap_TopLevelWindow_SetShape(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2765,16 +2868,22 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_Frame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_Frame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -2792,6 +2901,12 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -2875,17 +2990,23 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:Frame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:Frame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -2903,6 +3024,12 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -2917,7 +3044,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -3053,12 +3180,17 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Frame_ProcessCommand",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Frame_ProcessCommand",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ProcessCommand(arg2); @@ -3066,7 +3198,7 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3084,13 +3216,34 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyO wxStatusBar *result; bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number",(char *) "style",(char *) "winid",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iliO:Frame_CreateStatusBar",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:Frame_CreateStatusBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = wxString_in_helper(obj4); @@ -3184,17 +3337,24 @@ static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObj bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Frame_SetStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Frame_SetStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStatusText((wxString const &)*arg2,arg3); @@ -3263,17 +3423,24 @@ static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Frame_PushStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Frame_PushStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PushStatusText((wxString const &)*arg2,arg3); @@ -3301,12 +3468,19 @@ static PyObject *_wrap_Frame_PopStatusText(PyObject *self, PyObject *args, PyObj wxFrame *arg1 = (wxFrame *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Frame_PopStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Frame_PopStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopStatusText(arg2); @@ -3326,12 +3500,17 @@ static PyObject *_wrap_Frame_SetStatusBarPane(PyObject *self, PyObject *args, Py wxFrame *arg1 = (wxFrame *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Frame_SetStatusBarPane",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Frame_SetStatusBarPane",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStatusBarPane(arg2); @@ -3364,7 +3543,7 @@ static PyObject *_wrap_Frame_GetStatusBarPane(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3381,13 +3560,27 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObj wxToolBar *result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style",(char *) "winid",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|liO:Frame_CreateToolBar",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Frame_CreateToolBar",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -3494,7 +3687,7 @@ static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject temp2 = True; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3573,16 +3766,22 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_Dialog",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_Dialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -3600,6 +3799,12 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -3679,17 +3884,23 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:Dialog_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:Dialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -3707,6 +3918,12 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -3721,7 +3938,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -3749,12 +3966,17 @@ static PyObject *_wrap_Dialog_SetReturnCode(PyObject *self, PyObject *args, PyOb wxDialog *arg1 = (wxDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "returnCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Dialog_SetReturnCode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetReturnCode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetReturnCode(arg2); @@ -3787,7 +4009,7 @@ static PyObject *_wrap_Dialog_GetReturnCode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3843,12 +4065,17 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args, long arg2 ; wxSizer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Dialog_CreateButtonSizer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_CreateButtonSizer",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizer *)(arg1)->CreateButtonSizer(arg2); @@ -3883,7 +4110,7 @@ static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3908,7 +4135,7 @@ static PyObject *_wrap_Dialog_ShowModal(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3920,12 +4147,17 @@ static PyObject *_wrap_Dialog_EndModal(PyObject *self, PyObject *args, PyObject wxDialog *arg1 = (wxDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "retCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Dialog_EndModal",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_EndModal",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EndModal(arg2); @@ -3958,7 +4190,7 @@ static PyObject *_wrap_Dialog_IsModalShowing(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3990,16 +4222,22 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MiniFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MiniFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -4017,6 +4255,12 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -4096,17 +4340,23 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MiniFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MiniFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMiniFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -4124,6 +4374,12 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -4138,7 +4394,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -4183,18 +4439,24 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py wxSize temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "bitmap",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOl:new_SplashScreenWindow",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:new_SplashScreenWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -4207,6 +4469,12 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSplashScreenWindow *)new wxSplashScreenWindow((wxBitmap const &)*arg1,arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6); @@ -4302,19 +4570,35 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject wxPoint temp6 ; wxSize temp7 ; 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 *) "bitmap",(char *) "splashStyle",(char *) "milliseconds",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OliOi|OOl:new_SplashScreen",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5,&obj5,&obj6,&arg8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:new_SplashScreen",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { arg6 = &temp6; @@ -4327,6 +4611,12 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj6, &arg7)) SWIG_fail; } } + if (obj7) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSplashScreen *)new wxSplashScreen((wxBitmap const &)*arg1,arg2,arg3,arg4,arg5,(wxPoint const &)*arg6,(wxSize const &)*arg7,arg8); @@ -4359,7 +4649,7 @@ static PyObject *_wrap_SplashScreen_GetSplashStyle(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4409,7 +4699,7 @@ static PyObject *_wrap_SplashScreen_GetTimeout(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4433,13 +4723,27 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k wxStatusBar *result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ilO:new_StatusBar",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_StatusBar",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -4507,14 +4811,26 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|lO:StatusBar_Create",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:StatusBar_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = wxString_in_helper(obj4); @@ -4529,7 +4845,7 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp5) delete arg5; @@ -4549,12 +4865,19 @@ static PyObject *_wrap_StatusBar_SetFieldsCount(PyObject *self, PyObject *args, wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 = (int) 1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_SetFieldsCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_SetFieldsCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFieldsCount(arg2); @@ -4587,7 +4910,7 @@ static PyObject *_wrap_StatusBar_GetFieldsCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4602,17 +4925,24 @@ static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, P bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:StatusBar_SetStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StatusBar_SetStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStatusText((wxString const &)*arg2,arg3); @@ -4641,12 +4971,19 @@ static PyObject *_wrap_StatusBar_GetStatusText(PyObject *self, PyObject *args, P int arg2 = (int) 0 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_GetStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_GetStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxStatusBar const *)arg1)->GetStatusText(arg2); @@ -4675,17 +5012,24 @@ static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args, bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:StatusBar_PushStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StatusBar_PushStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PushStatusText((wxString const &)*arg2,arg3); @@ -4713,12 +5057,19 @@ static PyObject *_wrap_StatusBar_PopStatusText(PyObject *self, PyObject *args, P wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_PopStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_PopStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopStatusText(arg2); @@ -4777,12 +5128,17 @@ static PyObject *_wrap_StatusBar_GetFieldRect(PyObject *self, PyObject *args, Py int arg2 ; wxRect result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:StatusBar_GetFieldRect",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StatusBar_GetFieldRect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxStatusBar_GetFieldRect(arg1,arg2); @@ -4806,12 +5162,17 @@ static PyObject *_wrap_StatusBar_SetMinHeight(PyObject *self, PyObject *args, Py wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:StatusBar_SetMinHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StatusBar_SetMinHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinHeight(arg2); @@ -4844,7 +5205,7 @@ static PyObject *_wrap_StatusBar_GetBorderX(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4869,7 +5230,7 @@ static PyObject *_wrap_StatusBar_GetBorderY(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4883,7 +5244,7 @@ static PyObject * StatusBar_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_SplitterNameStr_set(PyObject *_val) { +static int _wrap_SplitterNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SplitterNameStr is read-only."); return 1; } @@ -4919,15 +5280,21 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje 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 *) "point",(char *) "size",(char *) "style",(char *) "name", NULL + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_SplitterWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -4940,6 +5307,12 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -5009,16 +5382,22 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "point",(char *) "size",(char *) "style",(char *) "name", NULL + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SplitterWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SplitterWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -5031,6 +5410,12 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -5045,7 +5430,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -5119,12 +5504,17 @@ static PyObject *_wrap_SplitterWindow_SetSplitMode(PyObject *self, PyObject *arg wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetSplitMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetSplitMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSplitMode(arg2); @@ -5157,7 +5547,7 @@ static PyObject *_wrap_SplitterWindow_GetSplitMode(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5201,14 +5591,21 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "window1",(char *) "window2",(char *) "sashPosition", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:SplitterWindow_SplitVertically",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SplitVertically",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SplitVertically(arg2,arg3,arg4); @@ -5216,7 +5613,7 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5233,14 +5630,21 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "window1",(char *) "window2",(char *) "sashPosition", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:SplitterWindow_SplitHorizontally",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SplitHorizontally",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SplitHorizontally(arg2,arg3,arg4); @@ -5248,7 +5652,7 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5278,7 +5682,7 @@ static PyObject *_wrap_SplitterWindow_Unsplit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5309,7 +5713,7 @@ static PyObject *_wrap_SplitterWindow_ReplaceWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5334,7 +5738,7 @@ static PyObject *_wrap_SplitterWindow_IsSplit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5346,12 +5750,17 @@ static PyObject *_wrap_SplitterWindow_SetSashSize(PyObject *self, PyObject *args wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetSashSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetSashSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashSize(arg2); @@ -5371,12 +5780,17 @@ static PyObject *_wrap_SplitterWindow_SetBorderSize(PyObject *self, PyObject *ar wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorderSize(arg2); @@ -5409,7 +5823,7 @@ static PyObject *_wrap_SplitterWindow_GetSashSize(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5434,7 +5848,7 @@ static PyObject *_wrap_SplitterWindow_GetBorderSize(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5447,16 +5861,21 @@ static PyObject *_wrap_SplitterWindow_SetSashPosition(PyObject *self, PyObject * int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "redraw", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:SplitterWindow_SetSashPosition",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:SplitterWindow_SetSashPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5492,7 +5911,7 @@ static PyObject *_wrap_SplitterWindow_GetSashPosition(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5504,12 +5923,17 @@ static PyObject *_wrap_SplitterWindow_SetMinimumPaneSize(PyObject *self, PyObjec wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetMinimumPaneSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetMinimumPaneSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumPaneSize(arg2); @@ -5542,7 +5966,7 @@ static PyObject *_wrap_SplitterWindow_GetMinimumPaneSize(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5557,12 +5981,29 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args int arg4 = (int) 5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:SplitterWindow_SashHitTest",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SashHitTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SashHitTest(arg2,arg3,arg4); @@ -5570,7 +6011,7 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5614,7 +6055,7 @@ static PyObject *_wrap_SplitterWindow_SetNeedUpdating(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetNeedUpdating",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -5649,7 +6090,7 @@ static PyObject *_wrap_SplitterWindow_GetNeedUpdating(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5668,12 +6109,19 @@ static PyObject *_wrap_new_SplitterEvent(PyObject *self, PyObject *args, PyObjec wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxSplitterWindow *arg2 = (wxSplitterWindow *) (wxSplitterWindow *) NULL ; wxSplitterEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "splitter", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_SplitterEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SplitterEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5696,12 +6144,17 @@ static PyObject *_wrap_SplitterEvent_SetSashPosition(PyObject *self, PyObject *a wxSplitterEvent *arg1 = (wxSplitterEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterEvent_SetSashPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterEvent_SetSashPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashPosition(arg2); @@ -5734,7 +6187,7 @@ static PyObject *_wrap_SplitterEvent_GetSashPosition(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5786,7 +6239,7 @@ static PyObject *_wrap_SplitterEvent_GetX(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5811,7 +6264,7 @@ static PyObject *_wrap_SplitterEvent_GetY(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5825,7 +6278,7 @@ static PyObject * SplitterEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_SashNameStr_set(PyObject *_val) { +static int _wrap_SashNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SashNameStr is read-only."); return 1; } @@ -5845,7 +6298,7 @@ static PyObject *_wrap_SashNameStr_get() { } -static int _wrap_SashLayoutNameStr_set(PyObject *_val) { +static int _wrap_SashLayoutNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SashLayoutNameStr is read-only."); return 1; } @@ -5881,15 +6334,21 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject * 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 *)"Oi|OOlO:new_SashWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SashWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -5902,6 +6361,12 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -5971,16 +6436,22 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SashWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SashWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -5993,6 +6464,12 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -6007,7 +6484,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -6028,15 +6505,20 @@ static PyObject *_wrap_SashWindow_SetSashVisible(PyObject *self, PyObject *args, int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge",(char *) "sash", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:SashWindow_SetSashVisible",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashVisible",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6059,12 +6541,17 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args, int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_GetSashVisible",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_GetSashVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxSashWindow const *)arg1)->GetSashVisible((wxSashEdgePosition )arg2); @@ -6072,7 +6559,7 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6085,15 +6572,20 @@ static PyObject *_wrap_SashWindow_SetSashBorder(PyObject *self, PyObject *args, int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:SashWindow_SetSashBorder",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashBorder",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6116,12 +6608,17 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_HasBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_HasBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxSashWindow const *)arg1)->HasBorder((wxSashEdgePosition )arg2); @@ -6129,7 +6626,7 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6142,12 +6639,17 @@ static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args, int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_GetEdgeMargin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_GetEdgeMargin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxSashWindow const *)arg1)->GetEdgeMargin((wxSashEdgePosition )arg2); @@ -6155,7 +6657,7 @@ static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6167,12 +6669,17 @@ static PyObject *_wrap_SashWindow_SetDefaultBorderSize(PyObject *self, PyObject wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetDefaultBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetDefaultBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDefaultBorderSize(arg2); @@ -6205,7 +6712,7 @@ static PyObject *_wrap_SashWindow_GetDefaultBorderSize(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6217,12 +6724,17 @@ static PyObject *_wrap_SashWindow_SetExtraBorderSize(PyObject *self, PyObject *a wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetExtraBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetExtraBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraBorderSize(arg2); @@ -6255,7 +6767,7 @@ static PyObject *_wrap_SashWindow_GetExtraBorderSize(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6267,12 +6779,17 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeX(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMinimumSizeX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMinimumSizeX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumSizeX(arg2); @@ -6292,12 +6809,17 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeY(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMinimumSizeY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMinimumSizeY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumSizeY(arg2); @@ -6330,7 +6852,7 @@ static PyObject *_wrap_SashWindow_GetMinimumSizeX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6355,7 +6877,7 @@ static PyObject *_wrap_SashWindow_GetMinimumSizeY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6367,12 +6889,17 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeX(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMaximumSizeX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMaximumSizeX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaximumSizeX(arg2); @@ -6392,12 +6919,17 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeY(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMaximumSizeY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMaximumSizeY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaximumSizeY(arg2); @@ -6430,7 +6962,7 @@ static PyObject *_wrap_SashWindow_GetMaximumSizeX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6455,7 +6987,7 @@ static PyObject *_wrap_SashWindow_GetMaximumSizeY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6470,12 +7002,29 @@ static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, Py int arg4 = (int) 2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:SashWindow_SashHitTest",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SashWindow_SashHitTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->SashHitTest(arg2,arg3,arg4); @@ -6483,7 +7032,7 @@ static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6526,11 +7075,25 @@ static PyObject *_wrap_new_SashEvent(PyObject *self, PyObject *args, PyObject *k int arg1 = (int) 0 ; int arg2 = (int) wxSASH_NONE ; wxSashEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SashEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SashEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSashEvent *)new wxSashEvent(arg1,(wxSashEdgePosition )arg2); @@ -6550,12 +7113,17 @@ static PyObject *_wrap_SashEvent_SetEdge(PyObject *self, PyObject *args, PyObjec wxSashEvent *arg1 = (wxSashEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashEvent_SetEdge",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashEvent_SetEdge",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEdge((wxSashEdgePosition )arg2); @@ -6588,7 +7156,7 @@ static PyObject *_wrap_SashEvent_GetEdge(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6660,12 +7228,17 @@ static PyObject *_wrap_SashEvent_SetDragStatus(PyObject *self, PyObject *args, P wxSashEvent *arg1 = (wxSashEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "status", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashEvent_SetDragStatus",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashEvent_SetDragStatus",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashDragStatus) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDragStatus((wxSashDragStatus )arg2); @@ -6698,7 +7271,7 @@ static PyObject *_wrap_SashEvent_GetDragStatus(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6716,11 +7289,18 @@ static PyObject *_wrap_new_QueryLayoutInfoEvent(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 = (int) 0 ; wxQueryLayoutInfoEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_QueryLayoutInfoEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryLayoutInfoEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxQueryLayoutInfoEvent *)new wxQueryLayoutInfoEvent(arg1); @@ -6740,12 +7320,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetRequestedLength(PyObject *self, P wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "length", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetRequestedLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetRequestedLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRequestedLength(arg2); @@ -6778,7 +7363,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetRequestedLength(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6790,12 +7375,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject *a wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -6828,7 +7418,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6900,12 +7490,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetOrientation(PyObject *self, PyObj wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutOrientation) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation((wxLayoutOrientation )arg2); @@ -6938,7 +7533,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetOrientation(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6950,12 +7545,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObjec wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutAlignment) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxLayoutAlignment )arg2); @@ -6988,7 +7588,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7006,11 +7606,18 @@ static PyObject *_wrap_new_CalculateLayoutEvent(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 = (int) 0 ; wxCalculateLayoutEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_CalculateLayoutEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_CalculateLayoutEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCalculateLayoutEvent *)new wxCalculateLayoutEvent(arg1); @@ -7030,12 +7637,17 @@ static PyObject *_wrap_CalculateLayoutEvent_SetFlags(PyObject *self, PyObject *a wxCalculateLayoutEvent *arg1 = (wxCalculateLayoutEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CalculateLayoutEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalculateLayoutEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalculateLayoutEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -7068,7 +7680,7 @@ static PyObject *_wrap_CalculateLayoutEvent_GetFlags(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7158,15 +7770,21 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb 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 *)"Oi|OOlO:new_SashLayoutWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SashLayoutWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -7179,6 +7797,12 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -7248,16 +7872,22 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SashLayoutWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SashLayoutWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -7270,6 +7900,12 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -7284,7 +7920,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -7317,7 +7953,7 @@ static PyObject *_wrap_SashLayoutWindow_GetAlignment(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7342,7 +7978,7 @@ static PyObject *_wrap_SashLayoutWindow_GetOrientation(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7354,12 +7990,17 @@ static PyObject *_wrap_SashLayoutWindow_SetAlignment(PyObject *self, PyObject *a wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashLayoutWindow_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashLayoutWindow_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutAlignment) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxLayoutAlignment )arg2); @@ -7410,12 +8051,17 @@ static PyObject *_wrap_SashLayoutWindow_SetOrientation(PyObject *self, PyObject wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashLayoutWindow_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashLayoutWindow_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutOrientation) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation((wxLayoutOrientation )arg2); @@ -7509,7 +8155,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7542,7 +8188,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7575,7 +8221,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7595,12 +8241,19 @@ static PyObject *_wrap_new_PopupWindow(PyObject *self, PyObject *args, PyObject int arg2 = (int) wxBORDER_NONE ; wxPopupWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_PopupWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PopupWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPopupWindow *)new wxPopupWindow(arg1,arg2); @@ -7650,12 +8303,19 @@ static PyObject *_wrap_new_PopupTransientWindow(PyObject *self, PyObject *args, int arg2 = (int) wxBORDER_NONE ; wxPyPopupTransientWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_PopupTransientWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PopupTransientWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyPopupTransientWindow *)new wxPyPopupTransientWindow(arg1,arg2); @@ -7709,18 +8369,25 @@ static PyObject *_wrap_new_TipWindow(PyObject *self, PyObject *args, PyObject *k bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "text",(char *) "maxLength",(char *) "rectBound", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iO:new_TipWindow",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_TipWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -7824,15 +8491,23 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj 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 *)"O|iOOlO:new_VScrolledWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_VScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -7845,6 +8520,12 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -7944,16 +8625,24 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:VScrolledWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:VScrolledWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -7966,6 +8655,12 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -7980,7 +8675,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -8008,7 +8703,7 @@ static PyObject *_wrap_VScrolledWindow_SetLineCount(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_SetLineCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8039,7 +8734,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollToLine",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8049,7 +8744,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8062,12 +8757,17 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lines", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VScrolledWindow_ScrollLines",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollLines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollLines(arg2); @@ -8075,7 +8775,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8088,12 +8788,17 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pages", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VScrolledWindow_ScrollPages",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollPages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollPages(arg2); @@ -8101,7 +8806,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8121,7 +8826,7 @@ static PyObject *_wrap_VScrolledWindow_RefreshLine(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_RefreshLine",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8153,11 +8858,11 @@ static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VScrolledWindow_RefreshLines",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -8181,12 +8886,22 @@ static PyObject *_wrap_VScrolledWindow_HitTestXT(PyObject *self, PyObject *args, int 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 *)"Oii:VScrolledWindow_HitTestXT",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VScrolledWindow_HitTestXT",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyVScrolledWindow const *)arg1)->HitTest(arg2,arg3); @@ -8194,7 +8909,7 @@ static PyObject *_wrap_VScrolledWindow_HitTestXT(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8226,7 +8941,7 @@ static PyObject *_wrap_VScrolledWindow_HitTest(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8275,7 +8990,7 @@ static PyObject *_wrap_VScrolledWindow_GetLineCount(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8300,7 +9015,7 @@ static PyObject *_wrap_VScrolledWindow_GetFirstVisibleLine(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8325,7 +9040,7 @@ static PyObject *_wrap_VScrolledWindow_GetLastVisibleLine(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8346,7 +9061,7 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_IsVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8356,7 +9071,7 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8370,7 +9085,7 @@ static PyObject * VScrolledWindow_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_VListBoxNameStr_set(PyObject *_val) { +static int _wrap_VListBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable VListBoxNameStr is read-only."); return 1; } @@ -8406,15 +9121,23 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw 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 *)"O|iOOlO:new_VListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_VListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8427,6 +9150,12 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -8526,16 +9255,24 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:VListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:VListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8548,6 +9285,12 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -8562,7 +9305,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -8595,7 +9338,7 @@ static PyObject *_wrap_VListBox_GetItemCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8620,7 +9363,7 @@ static PyObject *_wrap_VListBox_HasMultipleSelection(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8645,7 +9388,7 @@ static PyObject *_wrap_VListBox_GetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8666,7 +9409,7 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_IsCurrent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8676,7 +9419,7 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8697,7 +9440,7 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_IsSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8707,7 +9450,7 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8732,7 +9475,7 @@ static PyObject *_wrap_VListBox_GetSelectedCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8763,7 +9506,7 @@ static PyObject *_wrap_VListBox_GetFirstSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8794,7 +9537,7 @@ static PyObject *_wrap_VListBox_GetNextSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8871,7 +9614,7 @@ static PyObject *_wrap_VListBox_SetItemCount(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_SetItemCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8917,12 +9660,17 @@ static PyObject *_wrap_VListBox_SetSelection(PyObject *self, PyObject *args, PyO wxPyVListBox *arg1 = (wxPyVListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "selection", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VListBox_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -8953,12 +9701,12 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:VListBox_Select",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -8969,7 +9717,7 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8992,11 +9740,11 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VListBox_SelectRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -9006,7 +9754,7 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9026,7 +9774,7 @@ static PyObject *_wrap_VListBox_Toggle(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_Toggle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9061,7 +9809,7 @@ static PyObject *_wrap_VListBox_SelectAll(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9086,7 +9834,7 @@ static PyObject *_wrap_VListBox_DeselectAll(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9130,12 +9878,22 @@ static PyObject *_wrap_VListBox_SetMarginsXY(PyObject *self, PyObject *args, PyO int arg2 ; int 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 *)"Oii:VListBox_SetMarginsXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VListBox_SetMarginsXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -9204,15 +9962,23 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject 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 *)"O|iOOlO:new_HtmlListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_HtmlListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -9225,6 +9991,12 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -9324,16 +10096,24 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:HtmlListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:HtmlListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -9346,6 +10126,12 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -9360,7 +10146,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -9412,7 +10198,7 @@ static PyObject *_wrap_HtmlListBox_SetItemCount(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlListBox_SetItemCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9494,12 +10280,17 @@ static PyObject *_wrap_new_TaskBarIconEvent(PyObject *self, PyObject *args, PyOb wxEventType arg1 ; wxTaskBarIcon *arg2 = (wxTaskBarIcon *) 0 ; wxTaskBarIconEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "evtType",(char *) "tbIcon", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iO:new_TaskBarIconEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_TaskBarIconEvent",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTaskBarIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9522,7 +10313,7 @@ static PyObject * TaskBarIconEvent_swigregister(PyObject *self, PyObject *args) Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_FileSelectorPromptStr_set(PyObject *_val) { +static int _wrap_FileSelectorPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only."); return 1; } @@ -9542,7 +10333,7 @@ static PyObject *_wrap_FileSelectorPromptStr_get() { } -static int _wrap_DirSelectorPromptStr_set(PyObject *_val) { +static int _wrap_DirSelectorPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only."); return 1; } @@ -9562,7 +10353,7 @@ static PyObject *_wrap_DirSelectorPromptStr_get() { } -static int _wrap_DirDialogNameStr_set(PyObject *_val) { +static int _wrap_DirDialogNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DirDialogNameStr is read-only."); return 1; } @@ -9582,7 +10373,7 @@ static PyObject *_wrap_DirDialogNameStr_get() { } -static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) { +static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only."); return 1; } @@ -9602,7 +10393,7 @@ static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() { } -static int _wrap_GetTextFromUserPromptStr_set(PyObject *_val) { +static int _wrap_GetTextFromUserPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GetTextFromUserPromptStr is read-only."); return 1; } @@ -9622,7 +10413,7 @@ static PyObject *_wrap_GetTextFromUserPromptStr_get() { } -static int _wrap_MessageBoxCaptionStr_set(PyObject *_val) { +static int _wrap_MessageBoxCaptionStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable MessageBoxCaptionStr is read-only."); return 1; } @@ -9706,7 +10497,7 @@ static PyObject *_wrap_ColourData_GetChooseFull(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9748,12 +10539,17 @@ static PyObject *_wrap_ColourData_GetCustomColour(PyObject *self, PyObject *args int arg2 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ColourData_GetCustomColour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourData_GetCustomColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCustomColour(arg2); @@ -9777,12 +10573,17 @@ static PyObject *_wrap_ColourData_SetChooseFull(PyObject *self, PyObject *args, wxColourData *arg1 = (wxColourData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ColourData_SetChooseFull",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourData_SetChooseFull",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetChooseFull(arg2); @@ -9835,13 +10636,18 @@ static PyObject *_wrap_ColourData_SetCustomColour(PyObject *self, PyObject *args wxColour *arg3 = 0 ; wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ColourData_SetCustomColour",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourData_SetCustomColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; @@ -9943,7 +10749,7 @@ static PyObject *_wrap_ColourDialog_ShowModal(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9980,6 +10786,7 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; @@ -9987,7 +10794,7 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k (char *) "parent",(char *) "message",(char *) "defaultPath",(char *) "style",(char *) "pos",(char *) "size",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOlOOO:new_DirDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_DirDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { @@ -10003,6 +10810,12 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k temp3 = True; } } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = &temp5; @@ -10140,7 +10953,7 @@ static PyObject *_wrap_DirDialog_GetStyle(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -10245,7 +11058,7 @@ static PyObject *_wrap_DirDialog_ShowModal(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10284,12 +11097,13 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject * PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "defaultDir",(char *) "defaultFile",(char *) "wildcard",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOlO:new_FileDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_FileDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { @@ -10319,6 +11133,12 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject * temp5 = True; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = &temp7; @@ -10576,12 +11396,17 @@ static PyObject *_wrap_FileDialog_SetStyle(PyObject *self, PyObject *args, PyObj wxFileDialog *arg1 = (wxFileDialog *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:FileDialog_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -10601,12 +11426,17 @@ static PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *self, PyObject *args, wxFileDialog *arg1 = (wxFileDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "filterIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FileDialog_SetFilterIndex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetFilterIndex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFilterIndex(arg2); @@ -10794,7 +11624,7 @@ static PyObject *_wrap_FileDialog_GetStyle(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -10819,7 +11649,7 @@ static PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10901,13 +11731,15 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, 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 *) "parent",(char *) "message",(char *) "caption",(char *) "LCOUNT",(char *) "choices",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiO|lO:new_MultiChoiceDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:new_MultiChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -10919,11 +11751,21 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO if (arg3 == NULL) SWIG_fail; temp3 = True; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; temp5 = True; } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = &temp7; @@ -11065,12 +11907,13 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "caption",(char *) "choices",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|lO:new_SingleChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&arg6,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:new_SingleChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11087,6 +11930,12 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py arg5 = wxString_LIST_helper(obj3); if (arg5 == NULL) SWIG_fail; } + if (obj4) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg7 = &temp6; @@ -11147,7 +11996,7 @@ static PyObject *_wrap_SingleChoiceDialog_GetSelection(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11190,12 +12039,17 @@ static PyObject *_wrap_SingleChoiceDialog_SetSelection(PyObject *self, PyObject wxSingleChoiceDialog *arg1 = (wxSingleChoiceDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SingleChoiceDialog_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SingleChoiceDialog_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSingleChoiceDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -11228,7 +12082,7 @@ static PyObject *_wrap_SingleChoiceDialog_ShowModal(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11262,12 +12116,13 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "caption",(char *) "defaultValue",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOlO:new_TextEntryDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_TextEntryDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11288,6 +12143,12 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj temp4 = True; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = &temp6; @@ -11421,7 +12282,7 @@ static PyObject *_wrap_TextEntryDialog_ShowModal(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11494,7 +12355,7 @@ static PyObject *_wrap_FontData_EnableEffects(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_EnableEffects",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11529,7 +12390,7 @@ static PyObject *_wrap_FontData_GetAllowSymbols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11612,7 +12473,7 @@ static PyObject *_wrap_FontData_GetEnableEffects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11666,7 +12527,7 @@ static PyObject *_wrap_FontData_GetShowHelp(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11686,7 +12547,7 @@ static PyObject *_wrap_FontData_SetAllowSymbols(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_SetAllowSymbols",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11800,12 +12661,22 @@ static PyObject *_wrap_FontData_SetRange(PyObject *self, PyObject *args, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:FontData_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FontData_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2,arg3); @@ -11833,7 +12704,7 @@ static PyObject *_wrap_FontData_SetShowHelp(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_SetShowHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11934,7 +12805,7 @@ static PyObject *_wrap_FontDialog_ShowModal(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11964,12 +12835,13 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "caption",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OlO:new_MessageDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_MessageDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11983,6 +12855,12 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec temp3 = True; } } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = &temp5; @@ -12037,7 +12915,7 @@ static PyObject *_wrap_MessageDialog_ShowModal(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12063,12 +12941,14 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "title",(char *) "message",(char *) "maximum",(char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOi:new_ProgressDialog",kwnames,&obj0,&obj1,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_ProgressDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -12079,9 +12959,21 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxProgressDialog *)new wxProgressDialog((wxString const &)*arg1,(wxString const &)*arg2,arg3,arg4,arg5); @@ -12121,13 +13013,18 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO bool result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "value",(char *) "newmsg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:ProgressDialog_Update",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ProgressDialog_Update",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProgressDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -12142,7 +13039,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -12193,11 +13090,25 @@ static PyObject *_wrap_new_FindDialogEvent(PyObject *self, PyObject *args, PyObj wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxFindDialogEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_FindDialogEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FindDialogEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFindDialogEvent *)new wxFindDialogEvent(arg1,arg2); @@ -12230,7 +13141,7 @@ static PyObject *_wrap_FindDialogEvent_GetFlags(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12335,12 +13246,17 @@ static PyObject *_wrap_FindDialogEvent_SetFlags(PyObject *self, PyObject *args, wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FindDialogEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FindDialogEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindDialogEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -12446,11 +13362,18 @@ static PyObject *_wrap_new_FindReplaceData(PyObject *self, PyObject *args, PyObj PyObject *resultobj; int arg1 = (int) 0 ; wxFindReplaceData *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_FindReplaceData",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FindReplaceData",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFindReplaceData *)new wxFindReplaceData(arg1); @@ -12575,7 +13498,7 @@ static PyObject *_wrap_FindReplaceData_GetFlags(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12587,12 +13510,17 @@ static PyObject *_wrap_FindReplaceData_SetFlags(PyObject *self, PyObject *args, wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FindReplaceData_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FindReplaceData_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -12705,11 +13633,12 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "data",(char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:new_FindReplaceDialog",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:new_FindReplaceDialog",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -12717,6 +13646,12 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFindReplaceDialog *)new wxFindReplaceDialog(arg1,arg2,(wxString const &)*arg3,arg4); @@ -12774,11 +13709,12 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "data",(char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|i:FindReplaceDialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:FindReplaceDialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindReplaceDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -12787,6 +13723,12 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,arg5); @@ -12794,7 +13736,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -12886,16 +13828,22 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MDIParentFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MDIParentFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -12913,6 +13861,12 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -12992,17 +13946,23 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MDIParentFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MDIParentFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -13020,6 +13980,12 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -13034,7 +14000,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -13283,16 +14249,22 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MDIChildFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MDIChildFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -13310,6 +14282,12 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -13393,17 +14371,23 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MDIChildFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MDIChildFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIChildFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -13421,6 +14405,12 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -13435,7 +14425,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -13495,7 +14485,7 @@ static PyObject *_wrap_MDIChildFrame_Maximize(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MDIChildFrame_Maximize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIChildFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13549,12 +14539,19 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj long arg2 = (long) 0 ; wxMDIClientWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:new_MDIClientWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_MDIClientWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMDIClientWindow *)new wxMDIClientWindow(arg1,arg2); @@ -13603,13 +14600,20 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:MDIClientWindow_Create",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MDIClientWindow_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIClientWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3); @@ -13617,7 +14621,7 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13647,15 +14651,21 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw 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 *)"Oi|OOlO:new_PyWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PyWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -13668,6 +14678,12 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -13735,12 +14751,32 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *self, PyObject *args int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyWindow_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -13764,12 +14800,39 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *self, PyObject *args, P int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyWindow_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -13790,12 +14853,22 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *self, PyObject *a int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyWindow_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -13816,12 +14889,22 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *self, PyObject * int arg2 ; int 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 *)"Oii:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -14050,7 +15133,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14075,7 +15158,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14100,7 +15183,7 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14125,7 +15208,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14150,7 +15233,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14263,15 +15346,21 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa 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 *)"Oi|OOlO:new_PyPanel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PyPanel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -14284,6 +15373,12 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -14351,12 +15446,32 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *self, PyObject *args, int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyPanel_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -14380,12 +15495,39 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *self, PyObject *args, Py int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyPanel_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -14406,12 +15548,22 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *self, PyObject *ar int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyPanel_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -14432,12 +15584,22 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *self, PyObject *a int arg2 ; int 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 *)"Oii:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -14666,7 +15828,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14691,7 +15853,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14716,7 +15878,7 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14741,7 +15903,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14766,7 +15928,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14863,7 +16025,7 @@ static PyObject * PyPanel_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_PrintoutTitleStr_set(PyObject *_val) { +static int _wrap_PrintoutTitleStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable PrintoutTitleStr is read-only."); return 1; } @@ -14883,7 +16045,7 @@ static PyObject *_wrap_PrintoutTitleStr_get() { } -static int _wrap_PreviewCanvasNameStr_set(PyObject *_val) { +static int _wrap_PreviewCanvasNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable PreviewCanvasNameStr is read-only."); return 1; } @@ -14967,7 +16129,7 @@ static PyObject *_wrap_PrintData_GetNoCopies(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14992,7 +16154,7 @@ static PyObject *_wrap_PrintData_GetCollate(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15017,7 +16179,7 @@ static PyObject *_wrap_PrintData_GetOrientation(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15042,7 +16204,7 @@ static PyObject *_wrap_PrintData_Ok(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15101,7 +16263,7 @@ static PyObject *_wrap_PrintData_GetColour(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15126,7 +16288,7 @@ static PyObject *_wrap_PrintData_GetDuplex(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15151,7 +16313,7 @@ static PyObject *_wrap_PrintData_GetPaperId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15204,7 +16366,7 @@ static PyObject *_wrap_PrintData_GetQuality(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15216,12 +16378,17 @@ static PyObject *_wrap_PrintData_SetNoCopies(PyObject *self, PyObject *args, PyO wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetNoCopies",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetNoCopies",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNoCopies(arg2); @@ -15249,7 +16416,7 @@ static PyObject *_wrap_PrintData_SetCollate(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetCollate",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15271,12 +16438,17 @@ static PyObject *_wrap_PrintData_SetOrientation(PyObject *self, PyObject *args, wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -15344,7 +16516,7 @@ static PyObject *_wrap_PrintData_SetColour(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15366,12 +16538,17 @@ static PyObject *_wrap_PrintData_SetDuplex(PyObject *self, PyObject *args, PyObj wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "duplex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetDuplex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetDuplex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDuplexMode) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDuplex((wxDuplexMode )arg2); @@ -15391,12 +16568,17 @@ static PyObject *_wrap_PrintData_SetPaperId(PyObject *self, PyObject *args, PyOb wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sizeId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetPaperId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPaperId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPaperSize) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPaperId((wxPaperSize )arg2); @@ -15447,12 +16629,17 @@ static PyObject *_wrap_PrintData_SetQuality(PyObject *self, PyObject *args, PyOb wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "quality", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetQuality",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetQuality",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetQuality(arg2); @@ -15655,7 +16842,7 @@ static PyObject *_wrap_PrintData_GetPrinterScaleX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -15680,7 +16867,7 @@ static PyObject *_wrap_PrintData_GetPrinterScaleY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -15705,7 +16892,7 @@ static PyObject *_wrap_PrintData_GetPrinterTranslateX(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -15730,7 +16917,7 @@ static PyObject *_wrap_PrintData_GetPrinterTranslateY(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -15755,7 +16942,7 @@ static PyObject *_wrap_PrintData_GetPrintMode(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15967,12 +17154,17 @@ static PyObject *_wrap_PrintData_SetPrinterScaleX(PyObject *self, PyObject *args wxPrintData *arg1 = (wxPrintData *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PrintData_SetPrinterScaleX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaleX(arg2); @@ -15992,12 +17184,17 @@ static PyObject *_wrap_PrintData_SetPrinterScaleY(PyObject *self, PyObject *args wxPrintData *arg1 = (wxPrintData *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PrintData_SetPrinterScaleY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaleY(arg2); @@ -16018,12 +17215,22 @@ static PyObject *_wrap_PrintData_SetPrinterScaling(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:PrintData_SetPrinterScaling",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterScaling",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaling(arg2,arg3); @@ -16043,12 +17250,17 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateX(PyObject *self, PyObject * wxPrintData *arg1 = (wxPrintData *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PrintData_SetPrinterTranslateX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslateX(arg2); @@ -16068,12 +17280,17 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateY(PyObject *self, PyObject * wxPrintData *arg1 = (wxPrintData *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PrintData_SetPrinterTranslateY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslateY(arg2); @@ -16094,12 +17311,22 @@ static PyObject *_wrap_PrintData_SetPrinterTranslation(PyObject *self, PyObject long arg2 ; long 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 *)"Oll:PrintData_SetPrinterTranslation",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterTranslation",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslation(arg2,arg3); @@ -16119,12 +17346,17 @@ static PyObject *_wrap_PrintData_SetPrintMode(PyObject *self, PyObject *args, Py wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "printMode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetPrintMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrintMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPrintMode) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrintMode((wxPrintMode )arg2); @@ -16205,7 +17437,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16235,7 +17467,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableMargins",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16265,7 +17497,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *self, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16295,7 +17527,7 @@ static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePaper",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16325,7 +17557,7 @@ static PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePrinter",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16360,7 +17592,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16385,7 +17617,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16410,7 +17642,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16435,7 +17667,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16460,7 +17692,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16485,7 +17717,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16510,7 +17742,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16651,7 +17883,7 @@ static PyObject *_wrap_PageSetupDialogData_GetPaperId(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16733,7 +17965,7 @@ static PyObject *_wrap_PageSetupDialogData_Ok(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16753,7 +17985,7 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultInfo",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16783,7 +18015,7 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *self, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultMinMargins",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16929,12 +18161,17 @@ static PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *self, PyObject * wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PageSetupDialogData_SetPaperId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPaperId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPaperSize) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPaperId((wxPaperSize )arg2); @@ -17093,7 +18330,7 @@ static PyObject *_wrap_PageSetupDialog_ShowModal(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17171,7 +18408,7 @@ static PyObject *_wrap_PrintDialogData_GetFromPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17196,7 +18433,7 @@ static PyObject *_wrap_PrintDialogData_GetToPage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17221,7 +18458,7 @@ static PyObject *_wrap_PrintDialogData_GetMinPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17246,7 +18483,7 @@ static PyObject *_wrap_PrintDialogData_GetMaxPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17271,7 +18508,7 @@ static PyObject *_wrap_PrintDialogData_GetNoCopies(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17296,7 +18533,7 @@ static PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17321,7 +18558,7 @@ static PyObject *_wrap_PrintDialogData_GetSelection(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17346,7 +18583,7 @@ static PyObject *_wrap_PrintDialogData_GetCollate(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17371,7 +18608,7 @@ static PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17396,7 +18633,7 @@ static PyObject *_wrap_PrintDialogData_GetSetupDialog(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17408,12 +18645,17 @@ static PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *self, PyObject *arg wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetFromPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetFromPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFromPage(arg2); @@ -17433,12 +18675,17 @@ static PyObject *_wrap_PrintDialogData_SetToPage(PyObject *self, PyObject *args, wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetToPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetToPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToPage(arg2); @@ -17458,12 +18705,17 @@ static PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *self, PyObject *args wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetMinPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMinPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinPage(arg2); @@ -17483,12 +18735,17 @@ static PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *self, PyObject *args wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetMaxPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMaxPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaxPage(arg2); @@ -17508,12 +18765,17 @@ static PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *self, PyObject *arg wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetNoCopies",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetNoCopies",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNoCopies(arg2); @@ -17541,7 +18803,7 @@ static PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetAllPages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17571,7 +18833,7 @@ static PyObject *_wrap_PrintDialogData_SetSelection(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17601,7 +18863,7 @@ static PyObject *_wrap_PrintDialogData_SetCollate(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetCollate",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17631,7 +18893,7 @@ static PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetPrintToFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17661,7 +18923,7 @@ static PyObject *_wrap_PrintDialogData_SetSetupDialog(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSetupDialog",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17691,7 +18953,7 @@ static PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePrintToFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17721,7 +18983,7 @@ static PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17751,7 +19013,7 @@ static PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePageNumbers",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17781,7 +19043,7 @@ static PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17816,7 +19078,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17841,7 +19103,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17866,7 +19128,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17891,7 +19153,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17916,7 +19178,7 @@ static PyObject *_wrap_PrintDialogData_Ok(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18091,7 +19353,7 @@ static PyObject *_wrap_PrintDialog_ShowModal(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18224,14 +19486,21 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "printout",(char *) "prompt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Printer_Print",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Printer_Print",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrinter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Print(arg2,arg3,arg4); @@ -18239,7 +19508,7 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18343,7 +19612,7 @@ static PyObject *_wrap_Printer_Setup(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18368,7 +19637,7 @@ static PyObject *_wrap_Printer_GetAbort(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18390,7 +19659,7 @@ static PyObject *_wrap_Printer_GetLastError(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18568,12 +19837,22 @@ static PyObject *_wrap_Printout_SetPageSizePixels(PyObject *self, PyObject *args int arg2 ; int 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 *)"Oii:Printout_SetPageSizePixels",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPageSizePixels",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPageSizePixels(arg2,arg3); @@ -18632,12 +19911,22 @@ static PyObject *_wrap_Printout_SetPageSizeMM(PyObject *self, PyObject *args, Py int arg2 ; int 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 *)"Oii:Printout_SetPageSizeMM",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPageSizeMM",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPageSizeMM(arg2,arg3); @@ -18696,12 +19985,22 @@ static PyObject *_wrap_Printout_SetPPIScreen(PyObject *self, PyObject *args, PyO int arg2 ; int 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 *)"Oii:Printout_SetPPIScreen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPPIScreen",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPPIScreen(arg2,arg3); @@ -18760,12 +20059,22 @@ static PyObject *_wrap_Printout_SetPPIPrinter(PyObject *self, PyObject *args, Py int arg2 ; int 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 *)"Oii:Printout_SetPPIPrinter",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPPIPrinter",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPPIPrinter(arg2,arg3); @@ -18836,7 +20145,7 @@ static PyObject *_wrap_Printout_IsPreview(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18856,7 +20165,7 @@ static PyObject *_wrap_Printout_SetIsPreview(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_SetIsPreview",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18880,12 +20189,22 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "startPage",(char *) "endPage", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Printout_base_OnBeginDocument",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_base_OnBeginDocument",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnBeginDocument(arg2,arg3); @@ -18893,7 +20212,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19002,12 +20321,17 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyO int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "page", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Printout_base_HasPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_base_HasPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_HasPage(arg2); @@ -19015,7 +20339,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19100,12 +20424,13 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOlO:new_PreviewCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PreviewCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { @@ -19120,6 +20445,12 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -19178,12 +20509,13 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOlO:new_PreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -19203,6 +20535,12 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -19361,16 +20699,22 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO wxSize temp5 ; bool temp7 = 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 *) "preview",(char *) "buttons",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|OOlO:new_PreviewControlBar",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj3) { { @@ -19384,6 +20728,12 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -19431,7 +20781,7 @@ static PyObject *_wrap_PreviewControlBar_GetZoomControl(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19443,12 +20793,17 @@ static PyObject *_wrap_PreviewControlBar_SetZoomControl(PyObject *self, PyObject wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "zoom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PreviewControlBar_SetZoomControl",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PreviewControlBar_SetZoomControl",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPreviewControlBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetZoomControl(arg2); @@ -19654,12 +21009,17 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_SetCurrentPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetCurrentPage(arg2); @@ -19667,7 +21027,7 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19692,7 +21052,7 @@ static PyObject *_wrap_PrintPreview_GetCurrentPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19913,7 +21273,7 @@ static PyObject *_wrap_PrintPreview_PaintPage(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19947,7 +21307,7 @@ static PyObject *_wrap_PrintPreview_DrawBlankPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19960,12 +21320,17 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_RenderPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_RenderPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->RenderPage(arg2); @@ -19973,7 +21338,7 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20040,12 +21405,17 @@ static PyObject *_wrap_PrintPreview_SetZoom(PyObject *self, PyObject *args, PyOb wxPrintPreview *arg1 = (wxPrintPreview *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "percent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_SetZoom",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetZoom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetZoom(arg2); @@ -20078,7 +21448,7 @@ static PyObject *_wrap_PrintPreview_GetZoom(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20103,7 +21473,7 @@ static PyObject *_wrap_PrintPreview_GetMaxPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20128,7 +21498,7 @@ static PyObject *_wrap_PrintPreview_GetMinPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20153,7 +21523,7 @@ static PyObject *_wrap_PrintPreview_Ok(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20173,7 +21543,7 @@ static PyObject *_wrap_PrintPreview_SetOk(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetOk",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20204,7 +21574,7 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_Print",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20214,7 +21584,7 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20321,12 +21691,17 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_SetCurrentPage(arg2); @@ -20334,7 +21709,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20368,7 +21743,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20402,7 +21777,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20415,12 +21790,17 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_RenderPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_RenderPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_RenderPage(arg2); @@ -20428,7 +21808,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20440,12 +21820,17 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *self, PyObject *arg wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "percent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_SetZoom",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetZoom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetZoom(arg2); @@ -20474,7 +21859,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_Print",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20484,7 +21869,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20544,12 +21929,13 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOlO:new_PyPreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -20569,6 +21955,12 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -20786,16 +22178,22 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P wxSize temp5 ; bool temp7 = 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 *) "preview",(char *) "buttons",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|OOlO:new_PyPreviewControlBar",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj3) { { @@ -20809,6 +22207,12 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -20924,12 +22328,17 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *self, P wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "zoom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPreviewControlBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetZoomControl(arg2); @@ -22654,6 +24063,7 @@ static swig_type_info _swigt__p_wxCalculateLayoutEvent[] = {{"_p_wxCalculateLayo static swig_type_info _swigt__p_wxPyHtmlListBox[] = {{"_p_wxPyHtmlListBox", 0, "wxPyHtmlListBox *", 0},{"_p_wxPyHtmlListBox"},{0}}; static swig_type_info _swigt__p_wxPyVListBox[] = {{"_p_wxPyVListBox", 0, "wxPyVListBox *", 0},{"_p_wxPyVListBox"},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVListBox},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxMiniFrame[] = {{"_p_wxMiniFrame", 0, "wxMiniFrame *", 0},{"_p_wxMiniFrame"},{0}}; static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxFrame},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxFrame},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxFrame},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxFrame},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxFrame},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxFrame},{"_p_wxFrame"},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxFrame},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxFrame},{0}}; static swig_type_info _swigt__p_wxPyPrintout[] = {{"_p_wxPyPrintout", 0, "wxPyPrintout *", 0},{"_p_wxPyPrintout"},{0}}; @@ -22694,8 +24104,8 @@ static swig_type_info _swigt__p_wxPreviewControlBar[] = {{"_p_wxPreviewControlBa static swig_type_info _swigt__p_wxPyPreviewControlBar[] = {{"_p_wxPyPreviewControlBar", 0, "wxPyPreviewControlBar *", 0},{"_p_wxPyPreviewControlBar"},{0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}}; static swig_type_info _swigt__p_wxToolBar[] = {{"_p_wxToolBar", 0, "wxToolBar *", 0},{"_p_wxToolBar"},{0}}; -static swig_type_info _swigt__p_wxPrintDialogData[] = {{"_p_wxPrintDialogData", 0, "wxPrintDialogData *", 0},{"_p_wxPrintDialogData"},{0}}; static swig_type_info _swigt__p_wxPageSetupDialogData[] = {{"_p_wxPageSetupDialogData", 0, "wxPageSetupDialogData *", 0},{"_p_wxPageSetupDialogData"},{0}}; +static swig_type_info _swigt__p_wxPrintDialogData[] = {{"_p_wxPrintDialogData", 0, "wxPrintDialogData *", 0},{"_p_wxPrintDialogData"},{0}}; static swig_type_info *swig_types_initial[] = { _swigt__p_wxQueryLayoutInfoEvent, @@ -22738,6 +24148,7 @@ _swigt__p_wxCalculateLayoutEvent, _swigt__p_wxPyHtmlListBox, _swigt__p_wxPyVListBox, _swigt__p_wxRect, +_swigt__p_char, _swigt__p_wxMiniFrame, _swigt__p_wxFrame, _swigt__p_wxPyPrintout, @@ -22778,8 +24189,8 @@ _swigt__p_wxPreviewControlBar, _swigt__p_wxPyPreviewControlBar, _swigt__p_wxColour, _swigt__p_wxToolBar, -_swigt__p_wxPrintDialogData, _swigt__p_wxPageSetupDialogData, +_swigt__p_wxPrintDialogData, 0 }; @@ -22787,115 +24198,6 @@ _swigt__p_wxPageSetupDialogData, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOMENUBAR", (long) wxFULLSCREEN_NOMENUBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOTOOLBAR", (long) wxFULLSCREEN_NOTOOLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOSTATUSBAR", (long) wxFULLSCREEN_NOSTATUSBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOBORDER", (long) wxFULLSCREEN_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOCAPTION", (long) wxFULLSCREEN_NOCAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_ALL", (long) wxFULLSCREEN_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOPLEVEL_EX_DIALOG", (long) wxTOPLEVEL_EX_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_CENTRE_ON_PARENT", (long) wxSPLASH_CENTRE_ON_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_CENTRE_ON_SCREEN", (long) wxSPLASH_CENTRE_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_NO_CENTRE", (long) wxSPLASH_NO_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_TIMEOUT", (long) wxSPLASH_TIMEOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_NO_TIMEOUT", (long) wxSPLASH_NO_TIMEOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_NOBORDER", (long) wxSP_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_NOSASH", (long) wxSP_NOSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_PERMIT_UNSPLIT", (long) wxSP_PERMIT_UNSPLIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_LIVE_UPDATE", (long) wxSP_LIVE_UPDATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3DSASH", (long) wxSP_3DSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3DBORDER", (long) wxSP_3DBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_BORDER", (long) wxSP_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3D", (long) wxSP_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_HORIZONTAL", (long) wxSPLIT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_VERTICAL", (long) wxSPLIT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_NONE", (long) wxSPLIT_DRAG_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_DRAGGING", (long) wxSPLIT_DRAG_DRAGGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_LEFT_DOWN", (long) wxSPLIT_DRAG_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", (long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", (long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", (long) wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_UNSPLIT", (long) wxEVT_COMMAND_SPLITTER_UNSPLIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_NONE", (long) wxSASH_DRAG_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_DRAGGING", (long) wxSASH_DRAG_DRAGGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_LEFT_DOWN", (long) wxSASH_DRAG_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_NOBORDER", (long) wxSW_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_BORDER", (long) wxSW_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3DSASH", (long) wxSW_3DSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3DBORDER", (long) wxSW_3DBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3D", (long) wxSW_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_TOP", (long) wxSASH_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_RIGHT", (long) wxSASH_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_BOTTOM", (long) wxSASH_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_LEFT", (long) wxSASH_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_NONE", (long) wxSASH_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_STATUS_OK", (long) wxSASH_STATUS_OK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_STATUS_OUT_OF_RANGE", (long) wxSASH_STATUS_OUT_OF_RANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SASH_DRAGGED", (long) wxEVT_SASH_DRAGGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_HORIZONTAL", (long) wxLAYOUT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_VERTICAL", (long) wxLAYOUT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_NONE", (long) wxLAYOUT_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_TOP", (long) wxLAYOUT_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LEFT", (long) wxLAYOUT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_RIGHT", (long) wxLAYOUT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_BOTTOM", (long) wxLAYOUT_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LENGTH_Y", (long) wxLAYOUT_LENGTH_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LENGTH_X", (long) wxLAYOUT_LENGTH_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_MRU_LENGTH", (long) wxLAYOUT_MRU_LENGTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_QUERY", (long) wxLAYOUT_QUERY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_LAYOUT_INFO", (long) wxEVT_QUERY_LAYOUT_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALCULATE_LAYOUT", (long) wxEVT_CALCULATE_LAYOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_MOVE", (long) wxEVT_TASKBAR_MOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_DOWN", (long) wxEVT_TASKBAR_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_UP", (long) wxEVT_TASKBAR_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_DOWN", (long) wxEVT_TASKBAR_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_UP", (long) wxEVT_TASKBAR_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_DCLICK", (long) wxEVT_TASKBAR_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_DCLICK", (long) wxEVT_TASKBAR_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHOICEDLG_STYLE", (long) wxCHOICEDLG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_DOWN", (long) wxFR_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_WHOLEWORD", (long) wxFR_WHOLEWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_MATCHCASE", (long) wxFR_MATCHCASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_REPLACEDIALOG", (long) wxFR_REPLACEDIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOUPDOWN", (long) wxFR_NOUPDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOMATCHCASE", (long) wxFR_NOMATCHCASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOWHOLEWORD", (long) wxFR_NOWHOLEWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND", (long) wxEVT_COMMAND_FIND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_NEXT", (long) wxEVT_COMMAND_FIND_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_REPLACE", (long) wxEVT_COMMAND_FIND_REPLACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_REPLACE_ALL", (long) wxEVT_COMMAND_FIND_REPLACE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_CLOSE", (long) wxEVT_COMMAND_FIND_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILE", (long) 4001, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILEHOR", (long) 4001, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWCASCADE", (long) 4002, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWICONS", (long) 4003, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWNEXT", (long) 4004, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILEVERT", (long) 4005, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIRST_MDI_CHILD", (long) 4100, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAST_MDI_CHILD", (long) 4600, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_NONE", (long) wxPRINT_MODE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_PREVIEW", (long) wxPRINT_MODE_PREVIEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_FILE", (long) wxPRINT_MODE_FILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_PRINTER", (long) wxPRINT_MODE_PRINTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_NO_ERROR", (long) wxPRINTER_NO_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_CANCELLED", (long) wxPRINTER_CANCELLED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_ERROR", (long) wxPRINTER_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_PRINT", (long) wxPREVIEW_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_PREVIOUS", (long) wxPREVIEW_PREVIOUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_NEXT", (long) wxPREVIEW_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_ZOOM", (long) wxPREVIEW_ZOOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_FIRST", (long) wxPREVIEW_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_LAST", (long) wxPREVIEW_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_GOTO", (long) wxPREVIEW_GOTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_DEFAULT", (long) wxPREVIEW_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_CLOSE", (long) wxID_PREVIEW_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_NEXT", (long) wxID_PREVIEW_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_PREVIOUS", (long) wxID_PREVIEW_PREVIOUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_PRINT", (long) wxID_PREVIEW_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_ZOOM", (long) wxID_PREVIEW_ZOOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_FIRST", (long) wxID_PREVIEW_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_LAST", (long) wxID_PREVIEW_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_GOTO", (long) wxID_PREVIEW_GOTO, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -22927,14 +24229,65 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"DialogNameStr",_wrap_DialogNameStr_get, _wrap_DialogNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"StatusLineNameStr",_wrap_StatusLineNameStr_get, _wrap_StatusLineNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"ToolBarNameStr",_wrap_ToolBarNameStr_get, _wrap_ToolBarNameStr_set); + PyDict_SetItemString(d,"FULLSCREEN_NOMENUBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOMENUBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOTOOLBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOTOOLBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOSTATUSBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOSTATUSBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOBORDER", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOBORDER)); + PyDict_SetItemString(d,"FULLSCREEN_NOCAPTION", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOCAPTION)); + PyDict_SetItemString(d,"FULLSCREEN_ALL", SWIG_PyObj_FromInt((int)wxFULLSCREEN_ALL)); + PyDict_SetItemString(d,"TOPLEVEL_EX_DIALOG", SWIG_PyObj_FromInt((int)wxTOPLEVEL_EX_DIALOG)); + PyDict_SetItemString(d,"SPLASH_CENTRE_ON_PARENT", SWIG_PyObj_FromInt((int)wxSPLASH_CENTRE_ON_PARENT)); + PyDict_SetItemString(d,"SPLASH_CENTRE_ON_SCREEN", SWIG_PyObj_FromInt((int)wxSPLASH_CENTRE_ON_SCREEN)); + PyDict_SetItemString(d,"SPLASH_NO_CENTRE", SWIG_PyObj_FromInt((int)wxSPLASH_NO_CENTRE)); + PyDict_SetItemString(d,"SPLASH_TIMEOUT", SWIG_PyObj_FromInt((int)wxSPLASH_TIMEOUT)); + PyDict_SetItemString(d,"SPLASH_NO_TIMEOUT", SWIG_PyObj_FromInt((int)wxSPLASH_NO_TIMEOUT)); SWIG_addvarlink(SWIG_globals,(char*)"SplitterNameStr",_wrap_SplitterNameStr_get, _wrap_SplitterNameStr_set); + PyDict_SetItemString(d,"SP_NOBORDER", SWIG_PyObj_FromInt((int)wxSP_NOBORDER)); + PyDict_SetItemString(d,"SP_NOSASH", SWIG_PyObj_FromInt((int)wxSP_NOSASH)); + PyDict_SetItemString(d,"SP_PERMIT_UNSPLIT", SWIG_PyObj_FromInt((int)wxSP_PERMIT_UNSPLIT)); + PyDict_SetItemString(d,"SP_LIVE_UPDATE", SWIG_PyObj_FromInt((int)wxSP_LIVE_UPDATE)); + PyDict_SetItemString(d,"SP_3DSASH", SWIG_PyObj_FromInt((int)wxSP_3DSASH)); + PyDict_SetItemString(d,"SP_3DBORDER", SWIG_PyObj_FromInt((int)wxSP_3DBORDER)); + PyDict_SetItemString(d,"SP_BORDER", SWIG_PyObj_FromInt((int)wxSP_BORDER)); + PyDict_SetItemString(d,"SP_3D", SWIG_PyObj_FromInt((int)wxSP_3D)); + PyDict_SetItemString(d,"SPLIT_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSPLIT_HORIZONTAL)); + PyDict_SetItemString(d,"SPLIT_VERTICAL", SWIG_PyObj_FromInt((int)wxSPLIT_VERTICAL)); + PyDict_SetItemString(d,"SPLIT_DRAG_NONE", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_NONE)); + PyDict_SetItemString(d,"SPLIT_DRAG_DRAGGING", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_DRAGGING)); + PyDict_SetItemString(d,"SPLIT_DRAG_LEFT_DOWN", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_LEFT_DOWN)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_UNSPLIT)); SWIG_addvarlink(SWIG_globals,(char*)"SashNameStr",_wrap_SashNameStr_get, _wrap_SashNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"SashLayoutNameStr",_wrap_SashLayoutNameStr_get, _wrap_SashLayoutNameStr_set); + PyDict_SetItemString(d,"SASH_DRAG_NONE", SWIG_PyObj_FromInt((int)wxSASH_DRAG_NONE)); + PyDict_SetItemString(d,"SASH_DRAG_DRAGGING", SWIG_PyObj_FromInt((int)wxSASH_DRAG_DRAGGING)); + PyDict_SetItemString(d,"SASH_DRAG_LEFT_DOWN", SWIG_PyObj_FromInt((int)wxSASH_DRAG_LEFT_DOWN)); + PyDict_SetItemString(d,"SW_NOBORDER", SWIG_PyObj_FromInt((int)wxSW_NOBORDER)); + PyDict_SetItemString(d,"SW_BORDER", SWIG_PyObj_FromInt((int)wxSW_BORDER)); + PyDict_SetItemString(d,"SW_3DSASH", SWIG_PyObj_FromInt((int)wxSW_3DSASH)); + PyDict_SetItemString(d,"SW_3DBORDER", SWIG_PyObj_FromInt((int)wxSW_3DBORDER)); + PyDict_SetItemString(d,"SW_3D", SWIG_PyObj_FromInt((int)wxSW_3D)); + PyDict_SetItemString(d,"SASH_TOP", SWIG_PyObj_FromInt((int)wxSASH_TOP)); + PyDict_SetItemString(d,"SASH_RIGHT", SWIG_PyObj_FromInt((int)wxSASH_RIGHT)); + PyDict_SetItemString(d,"SASH_BOTTOM", SWIG_PyObj_FromInt((int)wxSASH_BOTTOM)); + PyDict_SetItemString(d,"SASH_LEFT", SWIG_PyObj_FromInt((int)wxSASH_LEFT)); + PyDict_SetItemString(d,"SASH_NONE", SWIG_PyObj_FromInt((int)wxSASH_NONE)); + PyDict_SetItemString(d,"SASH_STATUS_OK", SWIG_PyObj_FromInt((int)wxSASH_STATUS_OK)); + PyDict_SetItemString(d,"SASH_STATUS_OUT_OF_RANGE", SWIG_PyObj_FromInt((int)wxSASH_STATUS_OUT_OF_RANGE)); PyDict_SetItemString(d, "wxEVT_SASH_DRAGGED", PyInt_FromLong(wxEVT_SASH_DRAGGED)); + PyDict_SetItemString(d,"LAYOUT_HORIZONTAL", SWIG_PyObj_FromInt((int)wxLAYOUT_HORIZONTAL)); + PyDict_SetItemString(d,"LAYOUT_VERTICAL", SWIG_PyObj_FromInt((int)wxLAYOUT_VERTICAL)); + PyDict_SetItemString(d,"LAYOUT_NONE", SWIG_PyObj_FromInt((int)wxLAYOUT_NONE)); + PyDict_SetItemString(d,"LAYOUT_TOP", SWIG_PyObj_FromInt((int)wxLAYOUT_TOP)); + PyDict_SetItemString(d,"LAYOUT_LEFT", SWIG_PyObj_FromInt((int)wxLAYOUT_LEFT)); + PyDict_SetItemString(d,"LAYOUT_RIGHT", SWIG_PyObj_FromInt((int)wxLAYOUT_RIGHT)); + PyDict_SetItemString(d,"LAYOUT_BOTTOM", SWIG_PyObj_FromInt((int)wxLAYOUT_BOTTOM)); + PyDict_SetItemString(d,"LAYOUT_LENGTH_Y", SWIG_PyObj_FromInt((int)wxLAYOUT_LENGTH_Y)); + PyDict_SetItemString(d,"LAYOUT_LENGTH_X", SWIG_PyObj_FromInt((int)wxLAYOUT_LENGTH_X)); + PyDict_SetItemString(d,"LAYOUT_MRU_LENGTH", SWIG_PyObj_FromInt((int)wxLAYOUT_MRU_LENGTH)); + PyDict_SetItemString(d,"LAYOUT_QUERY", SWIG_PyObj_FromInt((int)wxLAYOUT_QUERY)); PyDict_SetItemString(d, "wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong(wxEVT_QUERY_LAYOUT_INFO)); PyDict_SetItemString(d, "wxEVT_CALCULATE_LAYOUT", PyInt_FromLong(wxEVT_CALCULATE_LAYOUT)); SWIG_addvarlink(SWIG_globals,(char*)"VListBoxNameStr",_wrap_VListBoxNameStr_get, _wrap_VListBoxNameStr_set); @@ -22957,13 +24310,52 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set); SWIG_addvarlink(SWIG_globals,(char*)"GetTextFromUserPromptStr",_wrap_GetTextFromUserPromptStr_get, _wrap_GetTextFromUserPromptStr_set); SWIG_addvarlink(SWIG_globals,(char*)"MessageBoxCaptionStr",_wrap_MessageBoxCaptionStr_get, _wrap_MessageBoxCaptionStr_set); + PyDict_SetItemString(d,"CHOICEDLG_STYLE", SWIG_PyObj_FromInt((int)wxCHOICEDLG_STYLE)); + PyDict_SetItemString(d,"FR_DOWN", SWIG_PyObj_FromInt((int)wxFR_DOWN)); + PyDict_SetItemString(d,"FR_WHOLEWORD", SWIG_PyObj_FromInt((int)wxFR_WHOLEWORD)); + PyDict_SetItemString(d,"FR_MATCHCASE", SWIG_PyObj_FromInt((int)wxFR_MATCHCASE)); + PyDict_SetItemString(d,"FR_REPLACEDIALOG", SWIG_PyObj_FromInt((int)wxFR_REPLACEDIALOG)); + PyDict_SetItemString(d,"FR_NOUPDOWN", SWIG_PyObj_FromInt((int)wxFR_NOUPDOWN)); + PyDict_SetItemString(d,"FR_NOMATCHCASE", SWIG_PyObj_FromInt((int)wxFR_NOMATCHCASE)); + PyDict_SetItemString(d,"FR_NOWHOLEWORD", SWIG_PyObj_FromInt((int)wxFR_NOWHOLEWORD)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND", PyInt_FromLong(wxEVT_COMMAND_FIND)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_NEXT", PyInt_FromLong(wxEVT_COMMAND_FIND_NEXT)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_REPLACE", PyInt_FromLong(wxEVT_COMMAND_FIND_REPLACE)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_REPLACE_ALL", PyInt_FromLong(wxEVT_COMMAND_FIND_REPLACE_ALL)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_CLOSE", PyInt_FromLong(wxEVT_COMMAND_FIND_CLOSE)); + PyDict_SetItemString(d,"IDM_WINDOWTILE", SWIG_PyObj_FromInt((int)4001)); + PyDict_SetItemString(d,"IDM_WINDOWTILEHOR", SWIG_PyObj_FromInt((int)4001)); + PyDict_SetItemString(d,"IDM_WINDOWCASCADE", SWIG_PyObj_FromInt((int)4002)); + PyDict_SetItemString(d,"IDM_WINDOWICONS", SWIG_PyObj_FromInt((int)4003)); + PyDict_SetItemString(d,"IDM_WINDOWNEXT", SWIG_PyObj_FromInt((int)4004)); + PyDict_SetItemString(d,"IDM_WINDOWTILEVERT", SWIG_PyObj_FromInt((int)4005)); + PyDict_SetItemString(d,"FIRST_MDI_CHILD", SWIG_PyObj_FromInt((int)4100)); + PyDict_SetItemString(d,"LAST_MDI_CHILD", SWIG_PyObj_FromInt((int)4600)); SWIG_addvarlink(SWIG_globals,(char*)"PrintoutTitleStr",_wrap_PrintoutTitleStr_get, _wrap_PrintoutTitleStr_set); SWIG_addvarlink(SWIG_globals,(char*)"PreviewCanvasNameStr",_wrap_PreviewCanvasNameStr_get, _wrap_PreviewCanvasNameStr_set); + PyDict_SetItemString(d,"PRINT_MODE_NONE", SWIG_PyObj_FromInt((int)wxPRINT_MODE_NONE)); + PyDict_SetItemString(d,"PRINT_MODE_PREVIEW", SWIG_PyObj_FromInt((int)wxPRINT_MODE_PREVIEW)); + PyDict_SetItemString(d,"PRINT_MODE_FILE", SWIG_PyObj_FromInt((int)wxPRINT_MODE_FILE)); + PyDict_SetItemString(d,"PRINT_MODE_PRINTER", SWIG_PyObj_FromInt((int)wxPRINT_MODE_PRINTER)); + PyDict_SetItemString(d,"PRINTER_NO_ERROR", SWIG_PyObj_FromInt((int)wxPRINTER_NO_ERROR)); + PyDict_SetItemString(d,"PRINTER_CANCELLED", SWIG_PyObj_FromInt((int)wxPRINTER_CANCELLED)); + PyDict_SetItemString(d,"PRINTER_ERROR", SWIG_PyObj_FromInt((int)wxPRINTER_ERROR)); + PyDict_SetItemString(d,"PREVIEW_PRINT", SWIG_PyObj_FromInt((int)wxPREVIEW_PRINT)); + PyDict_SetItemString(d,"PREVIEW_PREVIOUS", SWIG_PyObj_FromInt((int)wxPREVIEW_PREVIOUS)); + PyDict_SetItemString(d,"PREVIEW_NEXT", SWIG_PyObj_FromInt((int)wxPREVIEW_NEXT)); + PyDict_SetItemString(d,"PREVIEW_ZOOM", SWIG_PyObj_FromInt((int)wxPREVIEW_ZOOM)); + PyDict_SetItemString(d,"PREVIEW_FIRST", SWIG_PyObj_FromInt((int)wxPREVIEW_FIRST)); + PyDict_SetItemString(d,"PREVIEW_LAST", SWIG_PyObj_FromInt((int)wxPREVIEW_LAST)); + PyDict_SetItemString(d,"PREVIEW_GOTO", SWIG_PyObj_FromInt((int)wxPREVIEW_GOTO)); + PyDict_SetItemString(d,"PREVIEW_DEFAULT", SWIG_PyObj_FromInt((int)wxPREVIEW_DEFAULT)); + PyDict_SetItemString(d,"ID_PREVIEW_CLOSE", SWIG_PyObj_FromInt((int)wxID_PREVIEW_CLOSE)); + PyDict_SetItemString(d,"ID_PREVIEW_NEXT", SWIG_PyObj_FromInt((int)wxID_PREVIEW_NEXT)); + PyDict_SetItemString(d,"ID_PREVIEW_PREVIOUS", SWIG_PyObj_FromInt((int)wxID_PREVIEW_PREVIOUS)); + PyDict_SetItemString(d,"ID_PREVIEW_PRINT", SWIG_PyObj_FromInt((int)wxID_PREVIEW_PRINT)); + PyDict_SetItemString(d,"ID_PREVIEW_ZOOM", SWIG_PyObj_FromInt((int)wxID_PREVIEW_ZOOM)); + PyDict_SetItemString(d,"ID_PREVIEW_FIRST", SWIG_PyObj_FromInt((int)wxID_PREVIEW_FIRST)); + PyDict_SetItemString(d,"ID_PREVIEW_LAST", SWIG_PyObj_FromInt((int)wxID_PREVIEW_LAST)); + PyDict_SetItemString(d,"ID_PREVIEW_GOTO", SWIG_PyObj_FromInt((int)wxID_PREVIEW_GOTO)); wxPyPtrTypeMap_Add("wxPrintout", "wxPyPrintout"); diff --git a/wxPython/src/mac/wizard_wrap.cpp b/wxPython/src/mac/wizard_wrap.cpp index 9b61c6a994..541b775685 100644 --- a/wxPython/src/mac/wizard_wrap.cpp +++ b/wxPython/src/mac/wizard_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -392,15 +241,16 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxCommandEvent swig_types[8] #define SWIGTYPE_p_wxBitmap swig_types[9] #define SWIGTYPE_p_wxWizard swig_types[10] -#define SWIGTYPE_p_wxString swig_types[11] +#define SWIGTYPE_p_char swig_types[11] #define SWIGTYPE_p_wxEvtHandler swig_types[12] -#define SWIGTYPE_p_wxNotifyEvent swig_types[13] -#define SWIGTYPE_p_wxPanel swig_types[14] -#define SWIGTYPE_p_wxEvent swig_types[15] -#define SWIGTYPE_p_wxSize swig_types[16] -#define SWIGTYPE_p_wxChar swig_types[17] -#define SWIGTYPE_p_int swig_types[18] -static swig_type_info *swig_types[20]; +#define SWIGTYPE_p_wxString swig_types[13] +#define SWIGTYPE_p_wxNotifyEvent swig_types[14] +#define SWIGTYPE_p_wxPanel swig_types[15] +#define SWIGTYPE_p_wxEvent swig_types[16] +#define SWIGTYPE_p_wxSize swig_types[17] +#define SWIGTYPE_p_wxChar swig_types[18] +#define SWIGTYPE_p_int swig_types[19] +static swig_type_info *swig_types[21]; /* -------- TYPES TABLE (END) -------- */ @@ -412,6 +262,44 @@ static swig_type_info *swig_types[20]; #define SWIG_name "_wizard" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/printfw.h" @@ -420,6 +308,30 @@ static swig_type_info *swig_types[20]; static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap,wxString const &resource){ wxChar* res = NULL; if (resource.Length()) @@ -538,6 +450,13 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + #ifdef __cplusplus extern "C" { #endif @@ -548,16 +467,30 @@ static PyObject *_wrap_new_WizardEvent(PyObject *self, PyObject *args, PyObject bool arg3 = (bool) True ; wxWizardPage *arg4 = (wxWizardPage *) NULL ; wxWizardEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "type",(char *) "id",(char *) "direction",(char *) "page", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiOO:new_WizardEvent",kwnames,&arg1,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_WizardEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -596,7 +529,7 @@ static PyObject *_wrap_WizardEvent_GetDirection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -678,7 +611,7 @@ static PyObject *_wrap_WizardPage_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -894,7 +827,7 @@ static PyObject *_wrap_PyWizardPage_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -947,12 +880,32 @@ static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *self, PyObject * int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyWizardPage_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWizardPage_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -976,12 +929,39 @@ static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *self, PyObject *arg int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyWizardPage_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWizardPage_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -1002,12 +982,22 @@ static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *self, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyWizardPage_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -1028,12 +1018,22 @@ static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *self, PyObje int arg2 ; int 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 *)"Oii:PyWizardPage_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -1262,7 +1262,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1287,7 +1287,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1312,7 +1312,7 @@ static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1337,7 +1337,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1362,7 +1362,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *self wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1577,7 +1577,7 @@ static PyObject *_wrap_WizardPageSimple_Create(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1687,15 +1687,23 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar bool temp3 = False ; wxPoint temp5 ; 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 *) "title",(char *) "bitmap",(char *) "pos",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOOl:new_Wizard",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Wizard",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -1715,6 +1723,12 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWizard *)new wxWizard(arg1,arg2,(wxString const &)*arg3,(wxBitmap const &)*arg4,(wxPoint const &)*arg5,arg6); @@ -1775,6 +1789,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k wxPoint temp6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; @@ -1782,9 +1797,15 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "parent",(char *) "id",(char *) "title",(char *) "bitmap",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOO:Wizard_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Wizard_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWizard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -1811,7 +1832,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -1871,7 +1892,7 @@ static PyObject *_wrap_Wizard_RunWizard(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2024,12 +2045,17 @@ static PyObject *_wrap_Wizard_SetBorder(PyObject *self, PyObject *args, PyObject wxWizard *arg1 = (wxWizard *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Wizard_SetBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Wizard_SetBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWizard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorder(arg2); @@ -2062,7 +2088,7 @@ static PyObject *_wrap_Wizard_IsRunning(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2087,7 +2113,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2098,7 +2124,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2126,7 +2152,7 @@ static PyObject *_wrap_Wizard_HasNextPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2154,7 +2180,7 @@ static PyObject *_wrap_Wizard_HasPrevPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3258,8 +3284,9 @@ static swig_type_info _swigt__p_wxWizardEvent[] = {{"_p_wxWizardEvent", 0, "wxWi static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxWizardEvent", _p_wxWizardEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxCommandEvent},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxWizard[] = {{"_p_wxWizard", 0, "wxWizard *", 0},{"_p_wxWizard"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxWizardPage", _p_wxWizardPageTo_p_wxEvtHandler},{"_p_wxPyWizardPage", _p_wxPyWizardPageTo_p_wxEvtHandler},{"_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_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_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_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_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_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_wxWizard", _p_wxWizardTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxWizardPageSimple", _p_wxWizardPageSimpleTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_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_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{0}}; +static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxNotifyEvent},{"_p_wxNotifyEvent"},{"_p_wxWizardEvent", _p_wxWizardEventTo_p_wxNotifyEvent},{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_wxWizardPageSimple", _p_wxWizardPageSimpleTo_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_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{"_p_wxWizardPage", _p_wxWizardPageTo_p_wxPanel},{"_p_wxPyWizardPage", _p_wxPyWizardPageTo_p_wxPanel},{0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxEvent},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxWizardEvent", _p_wxWizardEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxEvent},{0}}; @@ -3279,8 +3306,9 @@ _swigt__p_wxWizardEvent, _swigt__p_wxCommandEvent, _swigt__p_wxBitmap, _swigt__p_wxWizard, -_swigt__p_wxString, +_swigt__p_char, _swigt__p_wxEvtHandler, +_swigt__p_wxString, _swigt__p_wxNotifyEvent, _swigt__p_wxPanel, _swigt__p_wxEvent, @@ -3294,12 +3322,6 @@ _swigt__p_int, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"WIZARD_EX_HELPBUTTON", (long) wxWIZARD_EX_HELPBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_PAGE_CHANGED", (long) wxEVT_WIZARD_PAGE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_PAGE_CHANGING", (long) wxEVT_WIZARD_PAGE_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_CANCEL", (long) wxEVT_WIZARD_CANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_HELP", (long) wxEVT_WIZARD_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_FINISHED", (long) wxEVT_WIZARD_FINISHED, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -3326,6 +3348,7 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"WIZARD_EX_HELPBUTTON", SWIG_PyObj_FromInt((int)wxWIZARD_EX_HELPBUTTON)); PyDict_SetItemString(d, "wxEVT_WIZARD_PAGE_CHANGED", PyInt_FromLong(wxEVT_WIZARD_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_WIZARD_PAGE_CHANGING", PyInt_FromLong(wxEVT_WIZARD_PAGE_CHANGING)); PyDict_SetItemString(d, "wxEVT_WIZARD_CANCEL", PyInt_FromLong(wxEVT_WIZARD_CANCEL)); diff --git a/wxPython/src/msw/calendar_wrap.cpp b/wxPython/src/msw/calendar_wrap.cpp index 61ae12a89f..7d37ee0fc9 100644 --- a/wxPython/src/msw/calendar_wrap.cpp +++ b/wxPython/src/msw/calendar_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -388,14 +237,15 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxCalendarDateAttr swig_types[4] #define SWIGTYPE_p_wxWindow swig_types[5] #define SWIGTYPE_p_wxCommandEvent swig_types[6] -#define SWIGTYPE_p_wxString swig_types[7] -#define SWIGTYPE_p_wxEvtHandler swig_types[8] -#define SWIGTYPE_p_wxFont swig_types[9] -#define SWIGTYPE_p_wxDateTime swig_types[10] -#define SWIGTYPE_p_wxControl swig_types[11] -#define SWIGTYPE_p_wxCalendarCtrl swig_types[12] -#define SWIGTYPE_p_wxEvent swig_types[13] -static swig_type_info *swig_types[15]; +#define SWIGTYPE_p_char swig_types[7] +#define SWIGTYPE_p_wxString swig_types[8] +#define SWIGTYPE_p_wxEvtHandler swig_types[9] +#define SWIGTYPE_p_wxFont swig_types[10] +#define SWIGTYPE_p_wxDateTime swig_types[11] +#define SWIGTYPE_p_wxControl swig_types[12] +#define SWIGTYPE_p_wxCalendarCtrl swig_types[13] +#define SWIGTYPE_p_wxEvent swig_types[14] +static swig_type_info *swig_types[16]; /* -------- TYPES TABLE (END) -------- */ @@ -407,12 +257,81 @@ static swig_type_info *swig_types[15]; #define SWIG_name "_calendar" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + static const wxString wxPyCalendarNameStr(wxCalendarNameStr); + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + #ifdef __cplusplus extern "C" { #endif @@ -434,11 +353,12 @@ static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyOb PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "colText",(char *) "colBack",(char *) "colBorder",(char *) "font",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOi:new_CalendarDateAttr",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_CalendarDateAttr",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; @@ -461,6 +381,12 @@ static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyOb PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } + if (obj4) { + { + arg5 = (wxCalendarDateBorder) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCalendarDateAttr *)new wxCalendarDateAttr((wxColour const &)*arg1,(wxColour const &)*arg2,(wxColour const &)*arg3,(wxFont const &)*arg4,(wxCalendarDateBorder )arg5); @@ -482,12 +408,17 @@ static PyObject *_wrap_new_CalendarDateAttrBorder(PyObject *self, PyObject *args wxColour *arg2 = (wxColour *) &arg2_defvalue ; wxCalendarDateAttr *result; wxColour temp2 ; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "border",(char *) "colBorder", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|O:new_CalendarDateAttrBorder",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_CalendarDateAttrBorder",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxCalendarDateBorder) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { { arg2 = &temp2; @@ -636,12 +567,17 @@ static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *self, PyObject *args wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CalendarDateAttr_SetBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarDateAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxCalendarDateBorder) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorder((wxCalendarDateBorder )arg2); @@ -669,7 +605,7 @@ static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetHoliday",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarDateAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -704,7 +640,7 @@ static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -729,7 +665,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -754,7 +690,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -779,7 +715,7 @@ static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -804,7 +740,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -829,7 +765,7 @@ static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -970,7 +906,7 @@ static PyObject *_wrap_CalendarDateAttr_GetBorder(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -990,12 +926,17 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec wxEventType arg2 ; wxCalendarEvent *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "cal",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:new_CalendarEvent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_CalendarEvent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCalendarEvent *)new wxCalendarEvent(arg1,arg2); @@ -1074,12 +1015,17 @@ static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *self, PyObject *args, wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "wd", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CalendarEvent_SetWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarEvent_SetWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWeekDay((wxDateTime::WeekDay )arg2); @@ -1112,7 +1058,7 @@ static PyObject *_wrap_CalendarEvent_GetWeekDay(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1126,7 +1072,7 @@ static PyObject * CalendarEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_CalendarNameStr_set(PyObject *_val) { +static int _wrap_CalendarNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable CalendarNameStr is read-only."); return 1; } @@ -1164,16 +1110,22 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "date",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlO:new_CalendarCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:new_CalendarCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { @@ -1192,6 +1144,12 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1263,17 +1221,23 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj bool temp8 = 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 *) "parent",(char *) "id",(char *) "date",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlO:CalendarCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:CalendarCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { @@ -1292,6 +1256,12 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -1306,7 +1276,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -1406,7 +1376,7 @@ static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1468,7 +1438,7 @@ static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1539,7 +1509,7 @@ static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1560,7 +1530,7 @@ static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -1592,7 +1562,7 @@ static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -1624,7 +1594,7 @@ static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -1944,7 +1914,7 @@ static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_GetAttr",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -1976,7 +1946,7 @@ static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:CalendarCtrl_SetAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxCalendarDateAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -2007,7 +1977,7 @@ static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_SetHoliday",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2037,7 +2007,7 @@ static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_ResetAttr",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2089,7 +2059,7 @@ static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2111,7 +2081,7 @@ static PyObject *_wrap_CalendarCtrl_Enable(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -2122,7 +2092,7 @@ static PyObject *_wrap_CalendarCtrl_Enable(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2144,7 +2114,7 @@ static PyObject *_wrap_CalendarCtrl_Show(PyObject *self, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalendarCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -2155,7 +2125,7 @@ static PyObject *_wrap_CalendarCtrl_Show(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2745,6 +2715,7 @@ static swig_type_info _swigt__p_wxCalendarEvent[] = {{"_p_wxCalendarEvent", 0, " static swig_type_info _swigt__p_wxCalendarDateAttr[] = {{"_p_wxCalendarDateAttr", 0, "wxCalendarDateAttr *", 0},{"_p_wxCalendarDateAttr"},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxCalendarCtrl", _p_wxCalendarCtrlTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxCalendarEvent", _p_wxCalendarEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxCalendarCtrl", _p_wxCalendarCtrlTo_p_wxEvtHandler},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; @@ -2761,6 +2732,7 @@ _swigt__p_wxCalendarEvent, _swigt__p_wxCalendarDateAttr, _swigt__p_wxWindow, _swigt__p_wxCommandEvent, +_swigt__p_char, _swigt__p_wxString, _swigt__p_wxEvtHandler, _swigt__p_wxFont, @@ -2775,28 +2747,6 @@ _swigt__p_wxEvent, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"CAL_SUNDAY_FIRST", (long) wxCAL_SUNDAY_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_MONDAY_FIRST", (long) wxCAL_MONDAY_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_SHOW_HOLIDAYS", (long) wxCAL_SHOW_HOLIDAYS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_NO_YEAR_CHANGE", (long) wxCAL_NO_YEAR_CHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_NO_MONTH_CHANGE", (long) wxCAL_NO_MONTH_CHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_SEQUENTIAL_MONTH_SELECTION", (long) wxCAL_SEQUENTIAL_MONTH_SELECTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_SHOW_SURROUNDING_WEEKS", (long) wxCAL_SHOW_SURROUNDING_WEEKS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_NOWHERE", (long) wxCAL_HITTEST_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_HEADER", (long) wxCAL_HITTEST_HEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_DAY", (long) wxCAL_HITTEST_DAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_INCMONTH", (long) wxCAL_HITTEST_INCMONTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_DECMONTH", (long) wxCAL_HITTEST_DECMONTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_HITTEST_SURROUNDING_WEEK", (long) wxCAL_HITTEST_SURROUNDING_WEEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_BORDER_NONE", (long) wxCAL_BORDER_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_BORDER_SQUARE", (long) wxCAL_BORDER_SQUARE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAL_BORDER_ROUND", (long) wxCAL_BORDER_ROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_DOUBLECLICKED", (long) wxEVT_CALENDAR_DOUBLECLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_SEL_CHANGED", (long) wxEVT_CALENDAR_SEL_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_DAY_CHANGED", (long) wxEVT_CALENDAR_DAY_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_MONTH_CHANGED", (long) wxEVT_CALENDAR_MONTH_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_YEAR_CHANGED", (long) wxEVT_CALENDAR_YEAR_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALENDAR_WEEKDAY_CLICKED", (long) wxEVT_CALENDAR_WEEKDAY_CLICKED, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -2823,6 +2773,22 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"CAL_SUNDAY_FIRST", SWIG_PyObj_FromInt((int)wxCAL_SUNDAY_FIRST)); + PyDict_SetItemString(d,"CAL_MONDAY_FIRST", SWIG_PyObj_FromInt((int)wxCAL_MONDAY_FIRST)); + PyDict_SetItemString(d,"CAL_SHOW_HOLIDAYS", SWIG_PyObj_FromInt((int)wxCAL_SHOW_HOLIDAYS)); + PyDict_SetItemString(d,"CAL_NO_YEAR_CHANGE", SWIG_PyObj_FromInt((int)wxCAL_NO_YEAR_CHANGE)); + PyDict_SetItemString(d,"CAL_NO_MONTH_CHANGE", SWIG_PyObj_FromInt((int)wxCAL_NO_MONTH_CHANGE)); + PyDict_SetItemString(d,"CAL_SEQUENTIAL_MONTH_SELECTION", SWIG_PyObj_FromInt((int)wxCAL_SEQUENTIAL_MONTH_SELECTION)); + PyDict_SetItemString(d,"CAL_SHOW_SURROUNDING_WEEKS", SWIG_PyObj_FromInt((int)wxCAL_SHOW_SURROUNDING_WEEKS)); + PyDict_SetItemString(d,"CAL_HITTEST_NOWHERE", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"CAL_HITTEST_HEADER", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_HEADER)); + PyDict_SetItemString(d,"CAL_HITTEST_DAY", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_DAY)); + PyDict_SetItemString(d,"CAL_HITTEST_INCMONTH", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_INCMONTH)); + PyDict_SetItemString(d,"CAL_HITTEST_DECMONTH", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_DECMONTH)); + PyDict_SetItemString(d,"CAL_HITTEST_SURROUNDING_WEEK", SWIG_PyObj_FromInt((int)wxCAL_HITTEST_SURROUNDING_WEEK)); + PyDict_SetItemString(d,"CAL_BORDER_NONE", SWIG_PyObj_FromInt((int)wxCAL_BORDER_NONE)); + PyDict_SetItemString(d,"CAL_BORDER_SQUARE", SWIG_PyObj_FromInt((int)wxCAL_BORDER_SQUARE)); + PyDict_SetItemString(d,"CAL_BORDER_ROUND", SWIG_PyObj_FromInt((int)wxCAL_BORDER_ROUND)); PyDict_SetItemString(d, "wxEVT_CALENDAR_DOUBLECLICKED", PyInt_FromLong(wxEVT_CALENDAR_DOUBLECLICKED)); PyDict_SetItemString(d, "wxEVT_CALENDAR_SEL_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_SEL_CHANGED)); PyDict_SetItemString(d, "wxEVT_CALENDAR_DAY_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_DAY_CHANGED)); diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py index 8fad8ee7be..efd656843e 100644 --- a/wxPython/src/msw/controls.py +++ b/wxPython/src/msw/controls.py @@ -929,6 +929,12 @@ class TextAttr(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls.delete_TextAttr): + """__del__()""" + try: + if self.thisown: destroy(self) + except: pass + def Init(*args, **kwargs): """Init()""" return _controls.TextAttr_Init(*args, **kwargs) @@ -1590,12 +1596,13 @@ class RadioBox(core.Control): return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, String label, Point point=DefaultPosition, + __init__(Window parent, int id, String label, Point pos=DefaultPosition, Size size=DefaultSize, int choices=0, String choices_array=None, int majorDimension=0, long style=RA_HORIZONTAL, Validator validator=DefaultValidator, String name=RadioBoxNameStr) -> RadioBox """ + if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'] newobj = _controls.new_RadioBox(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -1604,7 +1611,7 @@ class RadioBox(core.Control): def Create(*args, **kwargs): """ - Create(Window parent, int id, String label, Point point=DefaultPosition, + Create(Window parent, int id, String label, Point pos=DefaultPosition, Size size=DefaultSize, int choices=0, String choices_array=None, int majorDimension=0, long style=RA_HORIZONTAL, Validator validator=DefaultValidator, @@ -1737,10 +1744,11 @@ class Slider(core.Control): def __init__(self, *args, **kwargs): """ __init__(Window parent, int id, int value, int minValue, int maxValue, - Point point=DefaultPosition, Size size=DefaultSize, + Point pos=DefaultPosition, Size size=DefaultSize, long style=SL_HORIZONTAL, Validator validator=DefaultValidator, String name=SliderNameStr) -> Slider """ + if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'] newobj = _controls.new_Slider(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -1750,7 +1758,7 @@ class Slider(core.Control): def Create(*args, **kwargs): """ Create(Window parent, int id, int value, int minValue, int maxValue, - Point point=DefaultPosition, Size size=DefaultSize, + Point pos=DefaultPosition, Size size=DefaultSize, long style=SL_HORIZONTAL, Validator validator=DefaultValidator, String name=SliderNameStr) -> bool """ @@ -1809,7 +1817,7 @@ class Slider(core.Control): return _controls.Slider_GetThumbLength(*args, **kwargs) def SetTickFreq(*args, **kwargs): - """SetTickFreq(int n, int pos)""" + """SetTickFreq(int n, int pos=1)""" return _controls.Slider_SetTickFreq(*args, **kwargs) def GetTickFreq(*args, **kwargs): diff --git a/wxPython/src/msw/controls_wrap.cpp b/wxPython/src/msw/controls_wrap.cpp index 8b3587b53c..58299ea7b7 100644 --- a/wxPython/src/msw/controls_wrap.cpp +++ b/wxPython/src/msw/controls_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -433,38 +282,39 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxContextHelpButton swig_types[49] #define SWIGTYPE_p_wxRadioBox swig_types[50] #define SWIGTYPE_p_wxScrollBar swig_types[51] -#define SWIGTYPE_p_wxTreeItemId swig_types[52] -#define SWIGTYPE_p_wxComboBox swig_types[53] -#define SWIGTYPE_p_wxHelpEvent swig_types[54] -#define SWIGTYPE_p_wxListItem swig_types[55] -#define SWIGTYPE_p_wxNotebookSizer swig_types[56] -#define SWIGTYPE_p_wxSpinEvent swig_types[57] -#define SWIGTYPE_p_wxGenericDragImage swig_types[58] -#define SWIGTYPE_p_wxSpinCtrl swig_types[59] -#define SWIGTYPE_p_wxImageList swig_types[60] -#define SWIGTYPE_p_wxHelpProvider swig_types[61] -#define SWIGTYPE_p_wxTextAttr swig_types[62] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[63] -#define SWIGTYPE_p_wxPoint swig_types[64] -#define SWIGTYPE_p_wxListbookEvent swig_types[65] -#define SWIGTYPE_p_wxNotebookEvent swig_types[66] -#define SWIGTYPE_p_wxObject swig_types[67] -#define SWIGTYPE_p_wxCursor swig_types[68] -#define SWIGTYPE_p_wxKeyEvent swig_types[69] -#define SWIGTYPE_p_wxWindow swig_types[70] -#define SWIGTYPE_p_wxString swig_types[71] -#define SWIGTYPE_p_wxBitmap swig_types[72] -#define SWIGTYPE_p_wxTreeEvent swig_types[73] -#define SWIGTYPE_p_wxMouseEvent swig_types[74] -#define SWIGTYPE_p_wxCommandEvent swig_types[75] -#define SWIGTYPE_p_wxStaticText swig_types[76] -#define SWIGTYPE_p_wxControlWithItems swig_types[77] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[78] -#define SWIGTYPE_p_wxColour swig_types[79] -#define SWIGTYPE_p_wxToolBar swig_types[80] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[81] -#define SWIGTYPE_p_wxValidator swig_types[82] -static swig_type_info *swig_types[84]; +#define SWIGTYPE_p_char swig_types[52] +#define SWIGTYPE_p_wxTreeItemId swig_types[53] +#define SWIGTYPE_p_wxComboBox swig_types[54] +#define SWIGTYPE_p_wxHelpEvent swig_types[55] +#define SWIGTYPE_p_wxListItem swig_types[56] +#define SWIGTYPE_p_wxNotebookSizer swig_types[57] +#define SWIGTYPE_p_wxSpinEvent swig_types[58] +#define SWIGTYPE_p_wxGenericDragImage swig_types[59] +#define SWIGTYPE_p_wxSpinCtrl swig_types[60] +#define SWIGTYPE_p_wxImageList swig_types[61] +#define SWIGTYPE_p_wxHelpProvider swig_types[62] +#define SWIGTYPE_p_wxTextAttr swig_types[63] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[64] +#define SWIGTYPE_p_wxPoint swig_types[65] +#define SWIGTYPE_p_wxListbookEvent swig_types[66] +#define SWIGTYPE_p_wxNotebookEvent swig_types[67] +#define SWIGTYPE_p_wxObject swig_types[68] +#define SWIGTYPE_p_wxCursor swig_types[69] +#define SWIGTYPE_p_wxKeyEvent swig_types[70] +#define SWIGTYPE_p_wxWindow swig_types[71] +#define SWIGTYPE_p_wxString swig_types[72] +#define SWIGTYPE_p_wxBitmap swig_types[73] +#define SWIGTYPE_p_wxTreeEvent swig_types[74] +#define SWIGTYPE_p_wxMouseEvent swig_types[75] +#define SWIGTYPE_p_wxCommandEvent swig_types[76] +#define SWIGTYPE_p_wxStaticText swig_types[77] +#define SWIGTYPE_p_wxControlWithItems swig_types[78] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[79] +#define SWIGTYPE_p_wxColour swig_types[80] +#define SWIGTYPE_p_wxToolBar swig_types[81] +#define SWIGTYPE_p_wxBookCtrlSizer swig_types[82] +#define SWIGTYPE_p_wxValidator swig_types[83] +static swig_type_info *swig_types[85]; /* -------- TYPES TABLE (END) -------- */ @@ -476,6 +326,44 @@ static swig_type_info *swig_types[84]; #define SWIG_name "_controls" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" @@ -483,7 +371,38 @@ static swig_type_info *swig_types[84]; static const wxString wxPyEmptyString(wxEmptyString); static const wxString wxPyControlNameStr(wxControlNameStr); static const wxString wxPyButtonNameStr(wxButtonNameStr); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + static const wxString wxPyCheckBoxNameStr(wxCheckBoxNameStr); + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + static const wxString wxPyChoiceNameStr(wxChoiceNameStr); static const wxString wxPyComboBoxNameStr(wxComboBoxNameStr); static const wxString wxPyGaugeNameStr(wxGaugeNameStr); @@ -576,6 +495,14 @@ public: #endif static const wxString wxPyNOTEBOOK_NAME(wxNOTEBOOK_NAME); + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + static const wxString wxPyToolBarNameStr(wxToolBarNameStr); PyObject *wxToolBarToolBase_GetClientData(wxToolBarToolBase *self){ wxPyUserData* udata = (wxPyUserData*)self->GetClientData(); @@ -781,6 +708,17 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl); + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + wxPyTreeItemData *wxPyTreeCtrl_GetItemData(wxPyTreeCtrl *self,wxTreeItemId const &item){ wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item); if (data == NULL) { @@ -936,7 +874,7 @@ void wxHelpProvider_Destroy(wxHelpProvider *self){ delete self; } #ifdef __cplusplus extern "C" { #endif -static int _wrap_ButtonNameStr_set(PyObject *_val) { +static int _wrap_ButtonNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ButtonNameStr is read-only."); return 1; } @@ -976,17 +914,23 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_Button",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_Button",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -1004,6 +948,12 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -1095,18 +1045,24 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:Button_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:Button_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -1124,6 +1080,12 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -1144,7 +1106,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -1227,12 +1189,22 @@ static PyObject *_wrap_Button_SetImageMargins(PyObject *self, PyObject *args, Py int arg2 ; int 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 *)"Oii:Button_SetImageMargins",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Button_SetImageMargins",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetImageMargins(arg2,arg3); @@ -1299,17 +1271,23 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "bitmap",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_BitmapButton",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_BitmapButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -1326,6 +1304,12 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -1408,18 +1392,24 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "bitmap",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:BitmapButton_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:BitmapButton_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmapButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -1436,6 +1426,12 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -1456,7 +1452,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp9) delete arg9; @@ -1713,12 +1709,22 @@ static PyObject *_wrap_BitmapButton_SetMargins(PyObject *self, PyObject *args, P int arg2 ; int 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 *)"Oii:BitmapButton_SetMargins",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BitmapButton_SetMargins",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmapButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -1751,7 +1757,7 @@ static PyObject *_wrap_BitmapButton_GetMarginX(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1776,7 +1782,7 @@ static PyObject *_wrap_BitmapButton_GetMarginY(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1790,7 +1796,7 @@ static PyObject * BitmapButton_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_CheckBoxNameStr_set(PyObject *_val) { +static int _wrap_CheckBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable CheckBoxNameStr is read-only."); return 1; } @@ -1830,17 +1836,23 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_CheckBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_CheckBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -1858,6 +1870,12 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -1945,18 +1963,24 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:CheckBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:CheckBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -1974,6 +1998,12 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -1994,7 +2024,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -2035,7 +2065,7 @@ static PyObject *_wrap_CheckBox_GetValue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2060,7 +2090,7 @@ static PyObject *_wrap_CheckBox_IsChecked(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2080,7 +2110,7 @@ static PyObject *_wrap_CheckBox_SetValue(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckBox_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool const) SPyObj_AsBool(obj1); + arg2 = (bool const) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -2115,7 +2145,7 @@ static PyObject *_wrap_CheckBox_Get3StateValue(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2127,12 +2157,17 @@ static PyObject *_wrap_CheckBox_Set3StateValue(PyObject *self, PyObject *args, P wxCheckBox *arg1 = (wxCheckBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CheckBox_Set3StateValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckBox_Set3StateValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxCheckBoxState) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set3StateValue((wxCheckBoxState )arg2); @@ -2165,7 +2200,7 @@ static PyObject *_wrap_CheckBox_Is3State(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2190,7 +2225,7 @@ static PyObject *_wrap_CheckBox_Is3rdStateAllowedForUser(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2204,7 +2239,7 @@ static PyObject * CheckBox_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ChoiceNameStr_set(PyObject *_val) { +static int _wrap_ChoiceNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ChoiceNameStr is read-only."); return 1; } @@ -2244,17 +2279,23 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar wxSize temp4 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlOO:new_Choice",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg7,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:new_Choice",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -2274,6 +2315,12 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar if (arg6 == NULL) SWIG_fail; } } + if (obj5) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -2359,18 +2406,24 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlOO:Choice_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg8,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:Choice_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -2390,6 +2443,12 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -2410,7 +2469,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (arg7) delete [] arg7; } @@ -2449,7 +2508,7 @@ static PyObject *_wrap_Choice_GetColumns(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2461,12 +2520,19 @@ static PyObject *_wrap_Choice_SetColumns(PyObject *self, PyObject *args, PyObjec wxChoice *arg1 = (wxChoice *) 0 ; int arg2 = (int) (int)1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Choice_SetColumns",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Choice_SetColumns",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumns(arg2); @@ -2486,12 +2552,17 @@ static PyObject *_wrap_Choice_SetSelection(PyObject *self, PyObject *args, PyObj wxChoice *arg1 = (wxChoice *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Choice_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Choice_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -2553,13 +2624,18 @@ static PyObject *_wrap_Choice_SetString(PyObject *self, PyObject *args, PyObject wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Choice_SetString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Choice_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -2594,7 +2670,7 @@ static PyObject * Choice_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ComboBoxNameStr_set(PyObject *_val) { +static int _wrap_ComboBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ComboBoxNameStr is read-only."); return 1; } @@ -2637,18 +2713,24 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOOlOO:new_ComboBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&arg8,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOOO:new_ComboBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -2675,6 +2757,12 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -2771,19 +2859,25 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject bool temp10 = 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 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOOlOO:ComboBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&arg9,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOO:ComboBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -2810,6 +2904,12 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject if (arg8 == NULL) SWIG_fail; } } + if (obj7) { + { + arg9 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj8) { if ((SWIG_ConvertPtr(obj8,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg10 == NULL) { @@ -2830,7 +2930,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -3007,12 +3107,17 @@ static PyObject *_wrap_ComboBox_SetInsertionPoint(PyObject *self, PyObject *args wxComboBox *arg1 = (wxComboBox *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ComboBox_SetInsertionPoint",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetInsertionPoint",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInsertionPoint(arg2); @@ -3045,7 +3150,7 @@ static PyObject *_wrap_ComboBox_GetInsertionPoint(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -3070,7 +3175,7 @@ static PyObject *_wrap_ComboBox_GetLastPosition(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -3085,16 +3190,26 @@ static PyObject *_wrap_ComboBox_Replace(PyObject *self, PyObject *args, PyObject wxString *arg4 = 0 ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OllO:ComboBox_Replace",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ComboBox_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = wxString_in_helper(obj3); - if (arg4 == NULL) SWIG_fail; + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; temp4 = True; } { @@ -3124,12 +3239,17 @@ static PyObject *_wrap_ComboBox_SetSelection(PyObject *self, PyObject *args, PyO wxComboBox *arg1 = (wxComboBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ComboBox_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -3150,12 +3270,22 @@ static PyObject *_wrap_ComboBox_SetMark(PyObject *self, PyObject *args, PyObject long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ComboBox_SetMark",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_SetMark",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -3183,7 +3313,7 @@ static PyObject *_wrap_ComboBox_SetEditable(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetEditable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -3230,12 +3360,22 @@ static PyObject *_wrap_ComboBox_Remove(PyObject *self, PyObject *args, PyObject long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ComboBox_Remove",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_Remove",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxComboBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Remove(arg2,arg3); @@ -3257,7 +3397,7 @@ static PyObject * ComboBox_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_GaugeNameStr_set(PyObject *_val) { +static int _wrap_GaugeNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GaugeNameStr is read-only."); return 1; } @@ -3296,16 +3436,27 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "range",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|OOlOO:new_Gauge",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_Gauge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -3318,6 +3469,12 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -3396,17 +3553,28 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "range",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii|OOlOO:Gauge_Create",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:Gauge_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { arg5 = &temp5; @@ -3419,6 +3587,12 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -3439,7 +3613,7 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp9) delete arg9; @@ -3459,12 +3633,17 @@ static PyObject *_wrap_Gauge_SetRange(PyObject *self, PyObject *args, PyObject * wxGauge *arg1 = (wxGauge *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "range", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Gauge_SetRange",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetRange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2); @@ -3497,7 +3676,7 @@ static PyObject *_wrap_Gauge_GetRange(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3509,12 +3688,17 @@ static PyObject *_wrap_Gauge_SetValue(PyObject *self, PyObject *args, PyObject * wxGauge *arg1 = (wxGauge *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Gauge_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -3547,7 +3731,7 @@ static PyObject *_wrap_Gauge_GetValue(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3572,7 +3756,7 @@ static PyObject *_wrap_Gauge_IsVertical(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3584,12 +3768,17 @@ static PyObject *_wrap_Gauge_SetShadowWidth(PyObject *self, PyObject *args, PyOb wxGauge *arg1 = (wxGauge *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Gauge_SetShadowWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetShadowWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetShadowWidth(arg2); @@ -3622,7 +3811,7 @@ static PyObject *_wrap_Gauge_GetShadowWidth(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3634,12 +3823,17 @@ static PyObject *_wrap_Gauge_SetBezelFace(PyObject *self, PyObject *args, PyObje wxGauge *arg1 = (wxGauge *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Gauge_SetBezelFace",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetBezelFace",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGauge,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBezelFace(arg2); @@ -3672,7 +3866,7 @@ static PyObject *_wrap_Gauge_GetBezelFace(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3686,7 +3880,7 @@ static PyObject * Gauge_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_StaticBitmapNameStr_set(PyObject *_val) { +static int _wrap_StaticBitmapNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StaticBitmapNameStr is read-only."); return 1; } @@ -3706,7 +3900,7 @@ static PyObject *_wrap_StaticBitmapNameStr_get() { } -static int _wrap_StaticBoxNameStr_set(PyObject *_val) { +static int _wrap_StaticBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StaticBoxNameStr is read-only."); return 1; } @@ -3726,7 +3920,7 @@ static PyObject *_wrap_StaticBoxNameStr_get() { } -static int _wrap_StaticTextNameStr_set(PyObject *_val) { +static int _wrap_StaticTextNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StaticTextNameStr is read-only."); return 1; } @@ -3764,16 +3958,22 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_StaticBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_StaticBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -3791,6 +3991,12 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -3874,17 +4080,23 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:StaticBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:StaticBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -3902,6 +4114,12 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -3916,7 +4134,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -3962,15 +4180,21 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject * 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 *)"Oi|OOlO:new_StaticLine",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_StaticLine",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -3983,6 +4207,12 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -4052,16 +4282,22 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:StaticLine_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:StaticLine_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticLine,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -4074,6 +4310,12 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -4088,7 +4330,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -4121,7 +4363,7 @@ static PyObject *_wrap_StaticLine_IsVertical(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4143,7 +4385,7 @@ static PyObject *_wrap_StaticLine_GetDefaultSize(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4175,16 +4417,22 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject * wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_StaticText",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_StaticText",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -4202,6 +4450,12 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -4281,17 +4535,23 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:StaticText_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:StaticText_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticText,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -4309,6 +4569,12 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -4323,7 +4589,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -4370,16 +4636,22 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "bitmap",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_StaticBitmap",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_StaticBitmap",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4396,6 +4668,12 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -4466,17 +4744,23 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj bool temp8 = 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 *) "parent",(char *) "id",(char *) "bitmap",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:StaticBitmap_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:StaticBitmap_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4493,6 +4777,12 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -4507,7 +4797,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -4618,7 +4908,7 @@ static PyObject * StaticBitmap_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ListBoxNameStr_set(PyObject *_val) { +static int _wrap_ListBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ListBoxNameStr is read-only."); return 1; } @@ -4658,17 +4948,23 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa wxSize temp4 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlOO:new_ListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg7,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:new_ListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -4688,6 +4984,12 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa if (arg6 == NULL) SWIG_fail; } } + if (obj5) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -4773,18 +5075,24 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlOO:ListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg8,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:ListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -4804,6 +5112,12 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -4824,7 +5138,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (arg7) delete [] arg7; } @@ -4854,18 +5168,23 @@ static PyObject *_wrap_ListBox_Insert(PyObject *self, PyObject *args, PyObject * bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|O:ListBox_Insert",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ListBox_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { arg4 = obj3; } @@ -4898,11 +5217,12 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "items",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListBox_InsertItems",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_InsertItems",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { if (! PySequence_Check(obj1)) { @@ -4923,6 +5243,10 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj Py_DECREF(str); } } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->InsertItems((wxArrayString const &)*arg2,arg3); @@ -5000,12 +5324,17 @@ static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_IsSelected",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_IsSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxListBox const *)arg1)->IsSelected(arg2); @@ -5013,7 +5342,7 @@ static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5026,16 +5355,21 @@ static PyObject *_wrap_ListBox_SetSelection(PyObject *self, PyObject *args, PyOb int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "select", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:ListBox_SetSelection",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListBox_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5058,12 +5392,17 @@ static PyObject *_wrap_ListBox_Select(PyObject *self, PyObject *args, PyObject * wxListBox *arg1 = (wxListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_Select",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_Select",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Select(arg2); @@ -5083,12 +5422,17 @@ static PyObject *_wrap_ListBox_Deselect(PyObject *self, PyObject *args, PyObject wxListBox *arg1 = (wxListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_Deselect",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_Deselect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Deselect(arg2); @@ -5108,12 +5452,19 @@ static PyObject *_wrap_ListBox_DeselectAll(PyObject *self, PyObject *args, PyObj wxListBox *arg1 = (wxListBox *) 0 ; int arg2 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "itemToLeaveSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:ListBox_DeselectAll",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ListBox_DeselectAll",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeselectAll(arg2); @@ -5151,7 +5502,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5162,7 +5513,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5207,12 +5558,17 @@ static PyObject *_wrap_ListBox_SetFirstItem(PyObject *self, PyObject *args, PyOb wxListBox *arg1 = (wxListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_SetFirstItem",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_SetFirstItem",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFirstItem(arg2); @@ -5272,12 +5628,17 @@ static PyObject *_wrap_ListBox_EnsureVisible(PyObject *self, PyObject *args, PyO wxListBox *arg1 = (wxListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListBox_EnsureVisible",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_EnsureVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnsureVisible(arg2); @@ -5350,7 +5711,7 @@ static PyObject *_wrap_ListBox_IsSorted(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5384,17 +5745,23 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject wxSize temp4 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlOO:new_CheckListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg7,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:new_CheckListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -5414,6 +5781,12 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject if (arg6 == NULL) SWIG_fail; } } + if (obj5) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -5499,18 +5872,24 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlOO:CheckListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg8,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:CheckListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -5530,6 +5909,12 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -5550,7 +5935,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (arg7) delete [] arg7; } @@ -5577,12 +5962,17 @@ static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, Py int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CheckListBox_IsChecked",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckListBox_IsChecked",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsChecked(arg2); @@ -5590,7 +5980,7 @@ static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5603,12 +5993,24 @@ static PyObject *_wrap_CheckListBox_Check(PyObject *self, PyObject *args, PyObje int arg2 ; int arg3 = (int) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "check", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:CheckListBox_Check",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:CheckListBox_Check",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Check(arg2,arg3); @@ -5641,7 +6043,7 @@ static PyObject *_wrap_CheckListBox_GetItemHeight(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5673,7 +6075,7 @@ static PyObject *_wrap_CheckListBox_HitTest(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5687,12 +6089,22 @@ static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *self, PyObject *args, Py int 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 *)"Oii:CheckListBox_HitTestXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:CheckListBox_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCheckListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxCheckListBox const *)arg1)->HitTest(arg2,arg3); @@ -5700,7 +6112,7 @@ static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5714,7 +6126,7 @@ static PyObject * CheckListBox_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TextCtrlNameStr_set(PyObject *_val) { +static int _wrap_TextCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TextCtrlNameStr is read-only."); return 1; } @@ -5767,8 +6179,9 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O|OOi:new_TextAttr",&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O|OOO:new_TextAttr",&obj0,&obj1,&obj2,&obj3)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; @@ -5785,9 +6198,15 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTextAttr *)new wxTextAttr((wxColour const &)*arg1,(wxColour const &)*arg2,(wxFont const &)*arg3,(wxTextAttrAlignment )arg4); + if (obj3) { + { + arg4 = (wxTextAttrAlignment) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTextAttr *)new wxTextAttr((wxColour const &)*arg1,(wxColour const &)*arg2,(wxFont const &)*arg3,(wxTextAttrAlignment )arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5840,7 +6259,18 @@ static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args) { if (argc <= 3) { return _wrap_new_TextAttr__SWIG_1(self,args); } - return _wrap_new_TextAttr__SWIG_1(self,args); + { + SWIG_PyObj_AsInt(argv[3]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_TextAttr__SWIG_1(self,args); + } } } } @@ -5851,6 +6281,30 @@ static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args) { } +static PyObject *_wrap_delete_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxTextAttr *arg1 = (wxTextAttr *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TextAttr",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TextAttr_Init(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTextAttr *arg1 = (wxTextAttr *) 0 ; @@ -5944,16 +6398,23 @@ static PyObject *_wrap_TextAttr_SetFont(PyObject *self, PyObject *args, PyObject long arg3 = (long) wxTEXT_ATTR_FONT ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "font",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:TextAttr_SetFont",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TextAttr_SetFont",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFont((wxFont const &)*arg2,arg3); @@ -5973,12 +6434,17 @@ static PyObject *_wrap_TextAttr_SetAlignment(PyObject *self, PyObject *args, PyO wxTextAttr *arg1 = (wxTextAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TextAttr_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxTextAttrAlignment) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxTextAttrAlignment )arg2); @@ -6045,12 +6511,17 @@ static PyObject *_wrap_TextAttr_SetLeftIndent(PyObject *self, PyObject *args, Py wxTextAttr *arg1 = (wxTextAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "indent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TextAttr_SetLeftIndent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetLeftIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLeftIndent(arg2); @@ -6070,12 +6541,17 @@ static PyObject *_wrap_TextAttr_SetRightIndent(PyObject *self, PyObject *args, P wxTextAttr *arg1 = (wxTextAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "indent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TextAttr_SetRightIndent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetRightIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRightIndent(arg2); @@ -6095,12 +6571,17 @@ static PyObject *_wrap_TextAttr_SetFlags(PyObject *self, PyObject *args, PyObjec wxTextAttr *arg1 = (wxTextAttr *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextAttr_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -6133,7 +6614,7 @@ static PyObject *_wrap_TextAttr_HasTextColour(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6158,7 +6639,7 @@ static PyObject *_wrap_TextAttr_HasBackgroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6183,7 +6664,7 @@ static PyObject *_wrap_TextAttr_HasFont(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6208,7 +6689,7 @@ static PyObject *_wrap_TextAttr_HasAlignment(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6233,7 +6714,7 @@ static PyObject *_wrap_TextAttr_HasTabs(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6258,7 +6739,7 @@ static PyObject *_wrap_TextAttr_HasLeftIndent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6283,7 +6764,7 @@ static PyObject *_wrap_TextAttr_HasRightIndent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6296,12 +6777,17 @@ static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextAttr_HasFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_HasFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxTextAttr const *)arg1)->HasFlag(arg2); @@ -6309,7 +6795,7 @@ static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6418,7 +6904,7 @@ static PyObject *_wrap_TextAttr_GetAlignment(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6479,7 +6965,7 @@ static PyObject *_wrap_TextAttr_GetLeftIndent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -6504,7 +6990,7 @@ static PyObject *_wrap_TextAttr_GetRightIndent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -6529,7 +7015,7 @@ static PyObject *_wrap_TextAttr_GetFlags(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -6554,7 +7040,7 @@ static PyObject *_wrap_TextAttr_IsDefault(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6630,17 +7116,23 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOOlOO:new_TextCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:new_TextCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -6660,6 +7152,12 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -6752,18 +7250,24 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOOlOO:TextCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:TextCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -6783,6 +7287,12 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -6803,7 +7313,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -6904,12 +7414,22 @@ static PyObject *_wrap_TextCtrl_GetRange(PyObject *self, PyObject *args, PyObjec long arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:TextCtrl_GetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxTextCtrl const *)arg1)->GetRange(arg2,arg3); @@ -6936,12 +7456,17 @@ static PyObject *_wrap_TextCtrl_GetLineLength(PyObject *self, PyObject *args, Py long arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lineNo", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_GetLineLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_GetLineLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxTextCtrl const *)arg1)->GetLineLength(arg2); @@ -6949,7 +7474,7 @@ static PyObject *_wrap_TextCtrl_GetLineLength(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6962,12 +7487,17 @@ static PyObject *_wrap_TextCtrl_GetLineText(PyObject *self, PyObject *args, PyOb long arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lineNo", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_GetLineText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_GetLineText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxTextCtrl const *)arg1)->GetLineText(arg2); @@ -7006,7 +7536,7 @@ static PyObject *_wrap_TextCtrl_GetNumberOfLines(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7031,7 +7561,7 @@ static PyObject *_wrap_TextCtrl_IsModified(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7056,7 +7586,7 @@ static PyObject *_wrap_TextCtrl_IsEditable(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7081,7 +7611,7 @@ static PyObject *_wrap_TextCtrl_IsSingleLine(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7106,7 +7636,7 @@ static PyObject *_wrap_TextCtrl_IsMultiLine(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7214,13 +7744,23 @@ static PyObject *_wrap_TextCtrl_Replace(PyObject *self, PyObject *args, PyObject wxString *arg4 = 0 ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OllO:TextCtrl_Replace",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextCtrl_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -7254,12 +7794,22 @@ static PyObject *_wrap_TextCtrl_Remove(PyObject *self, PyObject *args, PyObject long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:TextCtrl_Remove",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_Remove",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Remove(arg2,arg3); @@ -7300,7 +7850,7 @@ static PyObject *_wrap_TextCtrl_LoadFile(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7344,7 +7894,7 @@ static PyObject *_wrap_TextCtrl_SaveFile(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7420,7 +7970,7 @@ static PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetMaxLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned long) SPyObj_AsUnsignedLong(obj1); + arg2 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -7541,7 +8091,7 @@ static PyObject *_wrap_TextCtrl_EmulateKeyPress(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7556,13 +8106,23 @@ static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObjec wxTextAttr *arg4 = 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "end",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OllO:TextCtrl_SetStyle",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextCtrl_SetStyle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -7574,7 +8134,7 @@ static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7588,13 +8148,18 @@ static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObjec wxTextAttr *arg3 = 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:TextCtrl_GetStyle",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetStyle",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTextAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -7606,7 +8171,7 @@ static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7637,7 +8202,7 @@ static PyObject *_wrap_TextCtrl_SetDefaultStyle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7679,12 +8244,22 @@ static PyObject *_wrap_TextCtrl_XYToPosition(PyObject *self, PyObject *args, PyO long arg3 ; long 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 *)"Oll:TextCtrl_XYToPosition",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_XYToPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxTextCtrl const *)arg1)->XYToPosition(arg2,arg3); @@ -7692,7 +8267,7 @@ static PyObject *_wrap_TextCtrl_XYToPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -7708,14 +8283,19 @@ static PyObject *_wrap_TextCtrl_PositionToXY(PyObject *self, PyObject *args, PyO long temp3 ; long temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; arg3 = &temp3; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_PositionToXY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_PositionToXY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxTextCtrl const *)arg1)->PositionToXY(arg2,arg3,arg4); @@ -7743,12 +8323,17 @@ static PyObject *_wrap_TextCtrl_ShowPosition(PyObject *self, PyObject *args, PyO wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_ShowPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_ShowPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ShowPosition(arg2); @@ -7853,7 +8438,7 @@ static PyObject *_wrap_TextCtrl_CanCopy(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7878,7 +8463,7 @@ static PyObject *_wrap_TextCtrl_CanCut(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7903,7 +8488,7 @@ static PyObject *_wrap_TextCtrl_CanPaste(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7976,7 +8561,7 @@ static PyObject *_wrap_TextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8001,7 +8586,7 @@ static PyObject *_wrap_TextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8013,12 +8598,17 @@ static PyObject *_wrap_TextCtrl_SetInsertionPoint(PyObject *self, PyObject *args wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:TextCtrl_SetInsertionPoint",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetInsertionPoint",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInsertionPoint(arg2); @@ -8075,7 +8665,7 @@ static PyObject *_wrap_TextCtrl_GetInsertionPoint(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -8100,7 +8690,7 @@ static PyObject *_wrap_TextCtrl_GetLastPosition(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -8113,12 +8703,22 @@ static PyObject *_wrap_TextCtrl_SetSelection(PyObject *self, PyObject *args, PyO long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:TextCtrl_SetSelection",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -8170,7 +8770,7 @@ static PyObject *_wrap_TextCtrl_SetEditable(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetEditable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8202,7 +8802,7 @@ static PyObject *_wrap_TextCtrl_ShowNativeCaret(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -8213,7 +8813,7 @@ static PyObject *_wrap_TextCtrl_ShowNativeCaret(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8238,7 +8838,7 @@ static PyObject *_wrap_TextCtrl_HideNativeCaret(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8292,12 +8892,22 @@ static PyObject *_wrap_TextCtrl_GetString(PyObject *self, PyObject *args, PyObje long arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:TextCtrl_GetString",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTextCtrl_GetString(arg1,arg2,arg3); @@ -8332,16 +8942,31 @@ static PyObject *_wrap_new_TextUrlEvent(PyObject *self, PyObject *args, PyObject long arg3 ; long arg4 ; wxTextUrlEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "evtMouse",(char *) "start",(char *) "end", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iOll:new_TextUrlEvent",kwnames,&arg1,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_TextUrlEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTextUrlEvent *)new wxTextUrlEvent(arg1,(wxMouseEvent const &)*arg2,arg3,arg4); @@ -8402,7 +9027,7 @@ static PyObject *_wrap_TextUrlEvent_GetURLStart(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -8427,7 +9052,7 @@ static PyObject *_wrap_TextUrlEvent_GetURLEnd(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -8441,7 +9066,7 @@ static PyObject * TextUrlEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ScrollBarNameStr_set(PyObject *_val) { +static int _wrap_ScrollBarNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ScrollBarNameStr is read-only."); return 1; } @@ -8479,16 +9104,24 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_ScrollBar",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_ScrollBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8501,6 +9134,12 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -8578,17 +9217,25 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:ScrollBar_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:ScrollBar_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8601,6 +9248,12 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -8621,7 +9274,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -8654,7 +9307,7 @@ static PyObject *_wrap_ScrollBar_GetThumbPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8679,7 +9332,7 @@ static PyObject *_wrap_ScrollBar_GetThumbSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8704,7 +9357,7 @@ static PyObject *_wrap_ScrollBar_GetPageSize(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8729,7 +9382,7 @@ static PyObject *_wrap_ScrollBar_GetRange(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8754,7 +9407,7 @@ static PyObject *_wrap_ScrollBar_IsVertical(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8766,12 +9419,17 @@ static PyObject *_wrap_ScrollBar_SetThumbPosition(PyObject *self, PyObject *args wxScrollBar *arg1 = (wxScrollBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "viewStart", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollBar_SetThumbPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollBar_SetThumbPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetThumbPosition(arg2); @@ -8795,16 +9453,36 @@ static PyObject *_wrap_ScrollBar_SetScrollbar(PyObject *self, PyObject *args, Py int arg5 ; bool arg6 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "thumbSize",(char *) "range",(char *) "pageSize",(char *) "refresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|O:ScrollBar_SetScrollbar",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:ScrollBar_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -8829,7 +9507,7 @@ static PyObject * ScrollBar_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_SPIN_BUTTON_NAME_set(PyObject *_val) { +static int _wrap_SPIN_BUTTON_NAME_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SPIN_BUTTON_NAME is read-only."); return 1; } @@ -8849,7 +9527,7 @@ static PyObject *_wrap_SPIN_BUTTON_NAME_get() { } -static int _wrap_SpinCtrlNameStr_set(PyObject *_val) { +static int _wrap_SpinCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SpinCtrlNameStr is read-only."); return 1; } @@ -8885,15 +9563,23 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject * 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 *)"O|iOOlO:new_SpinButton",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_SpinButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8906,6 +9592,12 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -8975,16 +9667,24 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:SpinButton_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:SpinButton_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8997,6 +9697,12 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -9011,7 +9717,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -9044,7 +9750,7 @@ static PyObject *_wrap_SpinButton_GetValue(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9069,7 +9775,7 @@ static PyObject *_wrap_SpinButton_GetMin(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9094,7 +9800,7 @@ static PyObject *_wrap_SpinButton_GetMax(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9106,12 +9812,17 @@ static PyObject *_wrap_SpinButton_SetValue(PyObject *self, PyObject *args, PyObj wxSpinButton *arg1 = (wxSpinButton *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinButton_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -9131,12 +9842,17 @@ static PyObject *_wrap_SpinButton_SetMin(PyObject *self, PyObject *args, PyObjec wxSpinButton *arg1 = (wxSpinButton *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinButton_SetMin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetMin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMin(arg2); @@ -9156,12 +9872,17 @@ static PyObject *_wrap_SpinButton_SetMax(PyObject *self, PyObject *args, PyObjec wxSpinButton *arg1 = (wxSpinButton *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "maxVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinButton_SetMax",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetMax",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMax(arg2); @@ -9182,15 +9903,25 @@ static PyObject *_wrap_SpinButton_SetRange(PyObject *self, PyObject *args, PyObj int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minVal",(char *) "maxVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:SpinButton_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinButton_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetRange(arg2,arg3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetRange(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9220,7 +9951,7 @@ static PyObject *_wrap_SpinButton_IsVertical(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9256,16 +9987,27 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp10 = 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 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "style",(char *) "min",(char *) "max",(char *) "initial",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOOliiiO:new_SpinCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOOOO:new_SpinCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -9285,6 +10027,30 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { { arg10 = wxString_in_helper(obj9); @@ -9368,17 +10134,28 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject bool temp11 = 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 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; PyObject * obj10 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "pos",(char *) "size",(char *) "style",(char *) "min",(char *) "max",(char *) "initial",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOOliiiO:SpinCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&arg8,&arg9,&arg10,&obj10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOOOOO:SpinCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -9398,6 +10175,30 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj9) { + { + arg10 = (int) SWIG_PyObj_AsInt(obj9); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj10) { { arg11 = wxString_in_helper(obj10); @@ -9412,7 +10213,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -9453,7 +10254,7 @@ static PyObject *_wrap_SpinCtrl_GetValue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9465,12 +10266,17 @@ static PyObject *_wrap_SpinCtrl_SetValue(PyObject *self, PyObject *args, PyObjec wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinCtrl_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinCtrl_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -9531,12 +10337,22 @@ static PyObject *_wrap_SpinCtrl_SetRange(PyObject *self, PyObject *args, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minVal",(char *) "maxVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:SpinCtrl_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinCtrl_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2,arg3); @@ -9569,7 +10385,7 @@ static PyObject *_wrap_SpinCtrl_GetMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9594,7 +10410,7 @@ static PyObject *_wrap_SpinCtrl_GetMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9607,12 +10423,22 @@ static PyObject *_wrap_SpinCtrl_SetSelection(PyObject *self, PyObject *args, PyO long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "from",(char *) "to", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:SpinCtrl_SetSelection",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -9639,11 +10465,25 @@ static PyObject *_wrap_new_SpinEvent(PyObject *self, PyObject *args, PyObject *k wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxSpinEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SpinEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SpinEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSpinEvent *)new wxSpinEvent(arg1,arg2); @@ -9676,7 +10516,7 @@ static PyObject *_wrap_SpinEvent_GetPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9688,12 +10528,17 @@ static PyObject *_wrap_SpinEvent_SetPosition(PyObject *self, PyObject *args, PyO wxSpinEvent *arg1 = (wxSpinEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -9715,7 +10560,7 @@ static PyObject * SpinEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_RadioBoxNameStr_set(PyObject *_val) { +static int _wrap_RadioBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable RadioBoxNameStr is read-only."); return 1; } @@ -9735,7 +10580,7 @@ static PyObject *_wrap_RadioBoxNameStr_get() { } -static int _wrap_RadioButtonNameStr_set(PyObject *_val) { +static int _wrap_RadioButtonNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable RadioButtonNameStr is read-only."); return 1; } @@ -9778,18 +10623,25 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw wxSize temp5 ; bool temp10 = 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 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { - (char *) "parent",(char *) "id",(char *) "label",(char *) "point",(char *) "size",(char *) "choices",(char *) "majorDimension",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "choices",(char *) "majorDimension",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOOilOO:new_RadioBox",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&arg8,&arg9,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOO:new_RadioBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -9814,6 +10666,18 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw if (arg7 == NULL) SWIG_fail; } } + if (obj6) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg9 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj8) { if ((SWIG_ConvertPtr(obj8,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg10 == NULL) { @@ -9910,19 +10774,26 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject bool temp11 = 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 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; PyObject * obj10 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "point",(char *) "size",(char *) "choices",(char *) "majorDimension",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "choices",(char *) "majorDimension",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOOilOO:RadioBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&arg9,&arg10,&obj9,&obj10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOOOO:RadioBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -9947,6 +10818,18 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject if (arg8 == NULL) SWIG_fail; } } + if (obj7) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg10 = (long) SWIG_PyObj_AsLong(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { if ((SWIG_ConvertPtr(obj9,(void **) &arg11, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg11 == NULL) { @@ -9967,7 +10850,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -10001,12 +10884,17 @@ static PyObject *_wrap_RadioBox_SetSelection(PyObject *self, PyObject *args, PyO wxRadioBox *arg1 = (wxRadioBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:RadioBox_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -10039,7 +10927,7 @@ static PyObject *_wrap_RadioBox_GetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10103,7 +10991,7 @@ static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -10136,7 +11024,7 @@ static PyObject *_wrap_RadioBox_GetCount(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10169,7 +11057,7 @@ static PyObject *_wrap_RadioBox_FindString(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -10190,12 +11078,17 @@ static PyObject *_wrap_RadioBox_GetString(PyObject *self, PyObject *args, PyObje int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:RadioBox_GetString",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_GetString",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxRadioBox const *)arg1)->GetString(arg2); @@ -10223,13 +11116,18 @@ static PyObject *_wrap_RadioBox_SetString(PyObject *self, PyObject *args, PyObje wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:RadioBox_SetString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RadioBox_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -10263,16 +11161,21 @@ static PyObject *_wrap_RadioBox_EnableItem(PyObject *self, PyObject *args, PyObj int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:RadioBox_EnableItem",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:RadioBox_EnableItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10296,16 +11199,21 @@ static PyObject *_wrap_RadioBox_ShowItem(PyObject *self, PyObject *args, PyObjec int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "show", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:RadioBox_ShowItem",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:RadioBox_ShowItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10341,7 +11249,7 @@ static PyObject *_wrap_RadioBox_GetColumnCount(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10366,7 +11274,7 @@ static PyObject *_wrap_RadioBox_GetRowCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10381,12 +11289,27 @@ static PyObject *_wrap_RadioBox_GetNextItem(PyObject *self, PyObject *args, PyOb long arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "dir",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiil:RadioBox_GetNextItem",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:RadioBox_GetNextItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (wxDirection) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxRadioBox const *)arg1)->GetNextItem(arg2,(wxDirection )arg3,arg4); @@ -10394,7 +11317,7 @@ static PyObject *_wrap_RadioBox_GetNextItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10428,17 +11351,23 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_RadioButton",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_RadioButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -10456,6 +11385,12 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -10543,18 +11478,24 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:RadioButton_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:RadioButton_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -10572,6 +11513,12 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -10592,7 +11539,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -10633,7 +11580,7 @@ static PyObject *_wrap_RadioButton_GetValue(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10653,7 +11600,7 @@ static PyObject *_wrap_RadioButton_SetValue(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioButton_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRadioButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -10677,7 +11624,7 @@ static PyObject * RadioButton_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_SliderNameStr_set(PyObject *_val) { +static int _wrap_SliderNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SliderNameStr is read-only."); return 1; } @@ -10718,16 +11665,37 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar wxSize temp7 ; bool temp10 = 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 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { - (char *) "parent",(char *) "id",(char *) "value",(char *) "minValue",(char *) "maxValue",(char *) "point",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "parent",(char *) "id",(char *) "value",(char *) "minValue",(char *) "maxValue",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|OOlOO:new_Slider",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&arg8,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOOOO:new_Slider",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { arg6 = &temp6; @@ -10740,6 +11708,12 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj6, &arg7)) SWIG_fail; } } + if (obj7) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj8) { if ((SWIG_ConvertPtr(obj8,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg9 == NULL) { @@ -10820,17 +11794,38 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k bool temp11 = 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 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; PyObject * obj10 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "minValue",(char *) "maxValue",(char *) "point",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "self",(char *) "parent",(char *) "id",(char *) "value",(char *) "minValue",(char *) "maxValue",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiiii|OOlOO:Slider_Create",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6,&obj7,&arg9,&obj9,&obj10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|OOOOO:Slider_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if (obj6) { { arg7 = &temp7; @@ -10843,6 +11838,12 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj7, &arg8)) SWIG_fail; } } + if (obj8) { + { + arg9 = (long) SWIG_PyObj_AsLong(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { if ((SWIG_ConvertPtr(obj9,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg10 == NULL) { @@ -10863,7 +11864,7 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp11) delete arg11; @@ -10896,7 +11897,7 @@ static PyObject *_wrap_Slider_GetValue(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10908,12 +11909,17 @@ static PyObject *_wrap_Slider_SetValue(PyObject *self, PyObject *args, PyObject wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -10934,12 +11940,22 @@ static PyObject *_wrap_Slider_SetRange(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minValue",(char *) "maxValue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Slider_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Slider_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2,arg3); @@ -10972,7 +11988,7 @@ static PyObject *_wrap_Slider_GetMin(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10997,7 +12013,7 @@ static PyObject *_wrap_Slider_GetMax(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11009,12 +12025,17 @@ static PyObject *_wrap_Slider_SetMin(PyObject *self, PyObject *args, PyObject *k wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minValue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetMin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetMin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMin(arg2); @@ -11034,12 +12055,17 @@ static PyObject *_wrap_Slider_SetMax(PyObject *self, PyObject *args, PyObject *k wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "maxValue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetMax",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetMax",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMax(arg2); @@ -11059,12 +12085,17 @@ static PyObject *_wrap_Slider_SetLineSize(PyObject *self, PyObject *args, PyObje wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lineSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetLineSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetLineSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLineSize(arg2); @@ -11084,12 +12115,17 @@ static PyObject *_wrap_Slider_SetPageSize(PyObject *self, PyObject *args, PyObje wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetPageSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetPageSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPageSize(arg2); @@ -11122,7 +12158,7 @@ static PyObject *_wrap_Slider_GetLineSize(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11147,7 +12183,7 @@ static PyObject *_wrap_Slider_GetPageSize(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11159,12 +12195,17 @@ static PyObject *_wrap_Slider_SetThumbLength(PyObject *self, PyObject *args, PyO wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lenPixels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetThumbLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetThumbLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetThumbLength(arg2); @@ -11197,7 +12238,7 @@ static PyObject *_wrap_Slider_GetThumbLength(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11208,14 +12249,26 @@ static PyObject *_wrap_Slider_SetTickFreq(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; - int arg3 ; + int arg3 = (int) 1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Slider_SetTickFreq",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Slider_SetTickFreq",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTickFreq(arg2,arg3); @@ -11248,7 +12301,7 @@ static PyObject *_wrap_Slider_GetTickFreq(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11284,12 +12337,17 @@ static PyObject *_wrap_Slider_SetTick(PyObject *self, PyObject *args, PyObject * wxSlider *arg1 = (wxSlider *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "tickPos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Slider_SetTick",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetTick",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTick(arg2); @@ -11346,7 +12404,7 @@ static PyObject *_wrap_Slider_GetSelEnd(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11371,7 +12429,7 @@ static PyObject *_wrap_Slider_GetSelStart(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11384,12 +12442,22 @@ static PyObject *_wrap_Slider_SetSelection(PyObject *self, PyObject *args, PyObj int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Slider_SetSelection",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Slider_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSlider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -11411,7 +12479,7 @@ static PyObject * Slider_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ToggleButtonNameStr_set(PyObject *_val) { +static int _wrap_ToggleButtonNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ToggleButtonNameStr is read-only."); return 1; } @@ -11451,17 +12519,23 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject wxSize temp5 ; bool temp8 = 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 *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlOO:new_ToggleButton",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:new_ToggleButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -11479,6 +12553,12 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -11566,18 +12646,24 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "label",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlOO:ToggleButton_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:ToggleButton_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToggleButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -11595,6 +12681,12 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg8 == NULL) { @@ -11615,7 +12707,7 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -11651,7 +12743,7 @@ static PyObject *_wrap_ToggleButton_SetValue(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToggleButton_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToggleButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11686,7 +12778,7 @@ static PyObject *_wrap_ToggleButton_GetValue(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11740,7 +12832,7 @@ static PyObject * ToggleButton_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_NOTEBOOK_NAME_set(PyObject *_val) { +static int _wrap_NOTEBOOK_NAME_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NOTEBOOK_NAME is read-only."); return 1; } @@ -11778,7 +12870,7 @@ static PyObject *_wrap_BookCtrl_GetPageCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -11799,7 +12891,7 @@ static PyObject *_wrap_BookCtrl_GetPage(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11836,7 +12928,7 @@ static PyObject *_wrap_BookCtrl_GetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11860,7 +12952,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BookCtrl_SetPageText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11875,7 +12967,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -11904,7 +12996,7 @@ static PyObject *_wrap_BookCtrl_GetPageText(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPageText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12022,7 +13114,7 @@ static PyObject *_wrap_BookCtrl_GetPageImage(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPageImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12032,7 +13124,7 @@ static PyObject *_wrap_BookCtrl_GetPageImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12047,14 +13139,19 @@ static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyO bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:BookCtrl_SetPageImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BookCtrl_SetPageImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -12064,7 +13161,7 @@ static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12152,7 +13249,7 @@ static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_DeletePage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12162,7 +13259,7 @@ static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12183,7 +13280,7 @@ static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_RemovePage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12193,7 +13290,7 @@ static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12218,7 +13315,7 @@ static PyObject *_wrap_BookCtrl_DeleteAllPages(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12238,11 +13335,12 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|Oi:BookCtrl_AddPage",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:BookCtrl_AddPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -12252,7 +13350,13 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); if (PyErr_Occurred()) SWIG_fail; } } @@ -12263,7 +13367,7 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -12293,14 +13397,15 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|Oi:BookCtrl_InsertPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:BookCtrl_InsertPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -12311,7 +13416,13 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -12322,7 +13433,7 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -12351,7 +13462,7 @@ static PyObject *_wrap_BookCtrl_SetSelection(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12361,7 +13472,7 @@ static PyObject *_wrap_BookCtrl_SetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12382,7 +13493,7 @@ static PyObject *_wrap_BookCtrl_AdvanceSelection(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -12414,11 +13525,39 @@ static PyObject *_wrap_new_BookCtrlEvent(PyObject *self, PyObject *args, PyObjec int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxBookCtrlEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_BookCtrlEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_BookCtrlEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBookCtrlEvent *)new wxBookCtrlEvent(arg1,arg2,arg3,arg4); @@ -12451,7 +13590,7 @@ static PyObject *_wrap_BookCtrlEvent_GetSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12463,12 +13602,17 @@ static PyObject *_wrap_BookCtrlEvent_SetSelection(PyObject *self, PyObject *args wxBookCtrlEvent *arg1 = (wxBookCtrlEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "nSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:BookCtrlEvent_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlEvent_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrlEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -12501,7 +13645,7 @@ static PyObject *_wrap_BookCtrlEvent_GetOldSelection(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12513,12 +13657,17 @@ static PyObject *_wrap_BookCtrlEvent_SetOldSelection(PyObject *self, PyObject *a wxBookCtrlEvent *arg1 = (wxBookCtrlEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:BookCtrlEvent_SetOldSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlEvent_SetOldSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrlEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOldSelection(arg2); @@ -12556,15 +13705,21 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw 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 *)"Oi|OOlO:new_Notebook",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Notebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -12577,6 +13732,12 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -12650,16 +13811,22 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Notebook_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Notebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNotebook,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -12672,6 +13839,12 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -12686,7 +13859,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -12719,7 +13892,7 @@ static PyObject *_wrap_Notebook_GetRowCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12816,7 +13989,7 @@ static PyObject *_wrap_Notebook_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -12911,11 +14084,39 @@ static PyObject *_wrap_new_NotebookEvent(PyObject *self, PyObject *args, PyObjec int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxNotebookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_NotebookEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_NotebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNotebookEvent *)new wxNotebookEvent(arg1,arg2,arg3,arg4); @@ -12953,15 +14154,21 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw 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 *)"Oi|OOlO:new_Listbook",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Listbook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -12974,6 +14181,12 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -13043,16 +14256,22 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Listbook_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Listbook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListbook,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -13065,6 +14284,12 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -13079,7 +14304,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -13112,7 +14337,7 @@ static PyObject *_wrap_Listbook_IsVertical(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13133,11 +14358,39 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *self, PyObject *args, PyObjec int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxListbookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_ListbookEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxListbookEvent *)new wxListbookEvent(arg1,arg2,arg3,arg4); @@ -13399,7 +14652,7 @@ static PyObject *_wrap_ToolBarToolBase_GetId(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13478,7 +14731,7 @@ static PyObject *_wrap_ToolBarToolBase_IsButton(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13503,7 +14756,7 @@ static PyObject *_wrap_ToolBarToolBase_IsControl(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13528,7 +14781,7 @@ static PyObject *_wrap_ToolBarToolBase_IsSeparator(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13553,7 +14806,7 @@ static PyObject *_wrap_ToolBarToolBase_GetStyle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13578,7 +14831,7 @@ static PyObject *_wrap_ToolBarToolBase_GetKind(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13603,7 +14856,7 @@ static PyObject *_wrap_ToolBarToolBase_IsEnabled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13628,7 +14881,7 @@ static PyObject *_wrap_ToolBarToolBase_IsToggled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13653,7 +14906,7 @@ static PyObject *_wrap_ToolBarToolBase_CanBeToggled(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13852,7 +15105,7 @@ static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarToolBase_Enable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarToolBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13862,7 +15115,7 @@ static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13907,7 +15160,7 @@ static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarToolBase_SetToggle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarToolBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13917,7 +15170,7 @@ static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13950,7 +15203,7 @@ static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -13991,7 +15244,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14235,9 +15488,11 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO bool temp7 = False ; bool temp8 = 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 ; PyObject * obj8 = 0 ; @@ -14245,8 +15500,12 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO (char *) "self",(char *) "id",(char *) "label",(char *) "bitmap",(char *) "bmpDisabled",(char *) "kind",(char *) "shortHelp",(char *) "longHelp",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|OiOOO:ToolBarBase_DoAddTool",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:ToolBarBase_DoAddTool",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -14262,6 +15521,12 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } + if (obj5) { + { + arg6 = (wxItemKind) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -14340,9 +15605,11 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args, bool temp9 = 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 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; @@ -14350,10 +15617,14 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args, (char *) "self",(char *) "pos",(char *) "id",(char *) "label",(char *) "bitmap",(char *) "bmpDisabled",(char *) "kind",(char *) "shortHelp",(char *) "longHelp",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiOO|OiOOO:ToolBarBase_DoInsertTool",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOOOO:ToolBarBase_DoInsertTool",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14371,6 +15642,12 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } + if (obj6) { + { + arg7 = (wxItemKind) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -14474,7 +15751,7 @@ static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_InsertToolItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxToolBarToolBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -14540,7 +15817,7 @@ static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_InsertControl",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -14566,12 +15843,17 @@ static PyObject *_wrap_ToolBarBase_FindControl(PyObject *self, PyObject *args, P int arg2 ; wxControl *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_FindControl",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_FindControl",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxControl *)(arg1)->FindControl(arg2); @@ -14629,7 +15911,7 @@ static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_InsertSeparator",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -14654,12 +15936,17 @@ static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *self, PyObject *args, Py int arg2 ; wxToolBarToolBase *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_RemoveTool",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_RemoveTool",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)(arg1)->RemoveTool(arg2); @@ -14690,7 +15977,7 @@ static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_DeleteToolByPos",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -14700,7 +15987,7 @@ static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14713,12 +16000,17 @@ static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, Py int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_DeleteTool",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_DeleteTool",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteTool(arg2); @@ -14726,7 +16018,7 @@ static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14775,7 +16067,7 @@ static PyObject *_wrap_ToolBarBase_Realize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14788,15 +16080,20 @@ static PyObject *_wrap_ToolBarBase_EnableTool(PyObject *self, PyObject *args, Py int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_EnableTool",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_EnableTool",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14819,15 +16116,20 @@ static PyObject *_wrap_ToolBarBase_ToggleTool(PyObject *self, PyObject *args, Py int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "toggle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_ToggleTool",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_ToggleTool",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14850,15 +16152,20 @@ static PyObject *_wrap_ToolBarBase_SetToggle(PyObject *self, PyObject *args, PyO int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "toggle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_SetToggle",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToggle",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14881,12 +16188,17 @@ static PyObject *_wrap_ToolBarBase_GetToolClientData(PyObject *self, PyObject *a int arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolClientData",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolClientData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxToolBarBase_GetToolClientData(arg1,arg2); @@ -14907,13 +16219,18 @@ static PyObject *_wrap_ToolBarBase_SetToolClientData(PyObject *self, PyObject *a int arg2 ; PyObject *arg3 = (PyObject *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_SetToolClientData",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolClientData",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14935,12 +16252,17 @@ static PyObject *_wrap_ToolBarBase_GetToolPos(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolPos",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolPos",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxToolBarBase const *)arg1)->GetToolPos(arg2); @@ -14948,7 +16270,7 @@ static PyObject *_wrap_ToolBarBase_GetToolPos(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14961,12 +16283,17 @@ static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args, int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolState",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolState",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetToolState(arg2); @@ -14974,7 +16301,7 @@ static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14987,12 +16314,17 @@ static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolEnabled",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetToolEnabled(arg2); @@ -15000,7 +16332,7 @@ static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15014,13 +16346,18 @@ static PyObject *_wrap_ToolBarBase_SetToolShortHelp(PyObject *self, PyObject *ar wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_SetToolShortHelp",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolShortHelp",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -15054,12 +16391,17 @@ static PyObject *_wrap_ToolBarBase_GetToolShortHelp(PyObject *self, PyObject *ar int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolShortHelp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolShortHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetToolShortHelp(arg2); @@ -15087,13 +16429,18 @@ static PyObject *_wrap_ToolBarBase_SetToolLongHelp(PyObject *self, PyObject *arg wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ToolBarBase_SetToolLongHelp",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolLongHelp",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -15127,12 +16474,17 @@ static PyObject *_wrap_ToolBarBase_GetToolLongHelp(PyObject *self, PyObject *arg int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_GetToolLongHelp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolLongHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetToolLongHelp(arg2); @@ -15159,12 +16511,22 @@ static PyObject *_wrap_ToolBarBase_SetMarginsXY(PyObject *self, PyObject *args, int arg2 ; int 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 *)"Oii:ToolBarBase_SetMarginsXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetMarginsXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -15215,12 +16577,17 @@ static PyObject *_wrap_ToolBarBase_SetToolPacking(PyObject *self, PyObject *args wxToolBarBase *arg1 = (wxToolBarBase *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "packing", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_SetToolPacking",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetToolPacking",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToolPacking(arg2); @@ -15240,12 +16607,17 @@ static PyObject *_wrap_ToolBarBase_SetToolSeparation(PyObject *self, PyObject *a wxToolBarBase *arg1 = (wxToolBarBase *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "separation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_SetToolSeparation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetToolSeparation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToolSeparation(arg2); @@ -15336,7 +16708,7 @@ static PyObject *_wrap_ToolBarBase_GetToolPacking(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15361,7 +16733,7 @@ static PyObject *_wrap_ToolBarBase_GetToolSeparation(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15373,12 +16745,17 @@ static PyObject *_wrap_ToolBarBase_SetRows(PyObject *self, PyObject *args, PyObj wxToolBarBase *arg1 = (wxToolBarBase *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "nRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_SetRows",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetRows",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRows(arg2); @@ -15399,12 +16776,22 @@ static PyObject *_wrap_ToolBarBase_SetMaxRowsCols(PyObject *self, PyObject *args int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rows",(char *) "cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ToolBarBase_SetMaxRowsCols",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetMaxRowsCols",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaxRowsCols(arg2,arg3); @@ -15437,7 +16824,7 @@ static PyObject *_wrap_ToolBarBase_GetMaxRows(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15462,7 +16849,7 @@ static PyObject *_wrap_ToolBarBase_GetMaxCols(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15565,12 +16952,22 @@ static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *self, PyObject int arg3 ; wxToolBarToolBase *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 *)"Oii:ToolBarBase_FindToolForPosition",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)(arg1)->FindToolForPosition(arg2,arg3); @@ -15593,12 +16990,17 @@ static PyObject *_wrap_ToolBarBase_FindById(PyObject *self, PyObject *args, PyOb int arg2 ; wxToolBarToolBase *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "toolid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ToolBarBase_FindById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_FindById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBarBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)((wxToolBarBase const *)arg1)->FindById(arg2); @@ -15633,7 +17035,7 @@ static PyObject *_wrap_ToolBarBase_IsVertical(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15663,15 +17065,21 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa 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 *)"Oi|OOlO:new_ToolBar",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_ToolBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -15684,6 +17092,12 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -15757,16 +17171,22 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject * bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:ToolBar_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:ToolBar_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -15779,6 +17199,12 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -15793,7 +17219,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -15815,12 +17241,22 @@ static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *self, PyObject *arg int arg3 ; wxToolBarToolBase *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 *)"Oii:ToolBar_FindToolForPosition",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxToolBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)(arg1)->FindToolForPosition(arg2,arg3); @@ -15844,7 +17280,7 @@ static PyObject * ToolBar_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ListCtrlNameStr_set(PyObject *_val) { +static int _wrap_ListCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ListCtrlNameStr is read-only."); return 1; } @@ -16025,7 +17461,7 @@ static PyObject *_wrap_ListItemAttr_HasTextColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16050,7 +17486,7 @@ static PyObject *_wrap_ListItemAttr_HasBackgroundColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16075,7 +17511,7 @@ static PyObject *_wrap_ListItemAttr_HasFont(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16301,12 +17737,17 @@ static PyObject *_wrap_ListItem_SetMask(PyObject *self, PyObject *args, PyObject wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetMask",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetMask",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMask(arg2); @@ -16326,12 +17767,17 @@ static PyObject *_wrap_ListItem_SetId(PyObject *self, PyObject *args, PyObject * wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -16351,12 +17797,17 @@ static PyObject *_wrap_ListItem_SetColumn(PyObject *self, PyObject *args, PyObje wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_SetColumn",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumn(arg2); @@ -16376,12 +17827,17 @@ static PyObject *_wrap_ListItem_SetState(PyObject *self, PyObject *args, PyObjec wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetState",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetState",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetState(arg2); @@ -16401,12 +17857,17 @@ static PyObject *_wrap_ListItem_SetStateMask(PyObject *self, PyObject *args, PyO wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stateMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetStateMask",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetStateMask",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStateMask(arg2); @@ -16466,12 +17927,17 @@ static PyObject *_wrap_ListItem_SetImage(PyObject *self, PyObject *args, PyObjec wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_SetImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetImage(arg2); @@ -16491,12 +17957,17 @@ static PyObject *_wrap_ListItem_SetData(PyObject *self, PyObject *args, PyObject wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_SetData",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetData(arg2); @@ -16516,12 +17987,17 @@ static PyObject *_wrap_ListItem_SetWidth(PyObject *self, PyObject *args, PyObjec wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -16541,12 +18017,17 @@ static PyObject *_wrap_ListItem_SetAlign(PyObject *self, PyObject *args, PyObjec wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_SetAlign",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetAlign",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxListColumnFormat) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlign((wxListColumnFormat )arg2); @@ -16671,7 +18152,7 @@ static PyObject *_wrap_ListItem_GetMask(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16696,7 +18177,7 @@ static PyObject *_wrap_ListItem_GetId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16721,7 +18202,7 @@ static PyObject *_wrap_ListItem_GetColumn(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16746,7 +18227,7 @@ static PyObject *_wrap_ListItem_GetState(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16805,7 +18286,7 @@ static PyObject *_wrap_ListItem_GetImage(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16830,7 +18311,7 @@ static PyObject *_wrap_ListItem_GetData(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16855,7 +18336,7 @@ static PyObject *_wrap_ListItem_GetWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16880,7 +18361,7 @@ static PyObject *_wrap_ListItem_GetAlign(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16930,7 +18411,7 @@ static PyObject *_wrap_ListItem_HasAttributes(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17029,12 +18510,17 @@ static PyObject *_wrap_ListItem_m_mask_set(PyObject *self, PyObject *args, PyObj wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_mask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_mask_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_mask_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_mask = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17057,7 +18543,7 @@ static PyObject *_wrap_ListItem_m_mask_get(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_mask); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17069,12 +18555,17 @@ static PyObject *_wrap_ListItem_m_itemId_set(PyObject *self, PyObject *args, PyO wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_itemId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_itemId_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_itemId_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_itemId = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17097,7 +18588,7 @@ static PyObject *_wrap_ListItem_m_itemId_get(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_itemId); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17109,12 +18600,17 @@ static PyObject *_wrap_ListItem_m_col_set(PyObject *self, PyObject *args, PyObje wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_m_col_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_col_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_col = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17137,7 +18633,7 @@ static PyObject *_wrap_ListItem_m_col_get(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_col); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17149,12 +18645,17 @@ static PyObject *_wrap_ListItem_m_state_set(PyObject *self, PyObject *args, PyOb wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_state_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_state_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_state = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17177,7 +18678,7 @@ static PyObject *_wrap_ListItem_m_state_get(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_state); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17189,12 +18690,17 @@ static PyObject *_wrap_ListItem_m_stateMask_set(PyObject *self, PyObject *args, wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_stateMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_stateMask_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_stateMask_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_stateMask = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17217,7 +18723,7 @@ static PyObject *_wrap_ListItem_m_stateMask_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_stateMask); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17290,12 +18796,17 @@ static PyObject *_wrap_ListItem_m_image_set(PyObject *self, PyObject *args, PyOb wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_m_image_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_image_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_image = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17318,7 +18829,7 @@ static PyObject *_wrap_ListItem_m_image_get(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_image); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17330,12 +18841,17 @@ static PyObject *_wrap_ListItem_m_data_set(PyObject *self, PyObject *args, PyObj wxListItem *arg1 = (wxListItem *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListItem_m_data_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_data_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_data = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17358,7 +18874,7 @@ static PyObject *_wrap_ListItem_m_data_get(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_data); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17370,12 +18886,17 @@ static PyObject *_wrap_ListItem_m_format_set(PyObject *self, PyObject *args, PyO wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_format", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_m_format_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_format_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_format = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17398,7 +18919,7 @@ static PyObject *_wrap_ListItem_m_format_get(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_format); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17410,12 +18931,17 @@ static PyObject *_wrap_ListItem_m_width_set(PyObject *self, PyObject *args, PyOb wxListItem *arg1 = (wxListItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListItem_m_width_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_width_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_width = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17438,7 +18964,7 @@ static PyObject *_wrap_ListItem_m_width_get(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_width); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17457,11 +18983,25 @@ static PyObject *_wrap_new_ListEvent(PyObject *self, PyObject *args, PyObject *k wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxListEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_ListEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_ListEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxListEvent *)new wxListEvent(arg1,arg2); @@ -17481,12 +19021,17 @@ static PyObject *_wrap_ListEvent_m_code_set(PyObject *self, PyObject *args, PyOb wxListEvent *arg1 = (wxListEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_code", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListEvent_m_code_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_code_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_code = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17509,7 +19054,7 @@ static PyObject *_wrap_ListEvent_m_code_get(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_code); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17521,12 +19066,17 @@ static PyObject *_wrap_ListEvent_m_oldItemIndex_set(PyObject *self, PyObject *ar wxListEvent *arg1 = (wxListEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_oldItemIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListEvent_m_oldItemIndex_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_oldItemIndex_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_oldItemIndex = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17549,7 +19099,7 @@ static PyObject *_wrap_ListEvent_m_oldItemIndex_get(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_oldItemIndex); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17561,12 +19111,17 @@ static PyObject *_wrap_ListEvent_m_itemIndex_set(PyObject *self, PyObject *args, wxListEvent *arg1 = (wxListEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_itemIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListEvent_m_itemIndex_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_itemIndex_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_itemIndex = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17589,7 +19144,7 @@ static PyObject *_wrap_ListEvent_m_itemIndex_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_itemIndex); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17601,12 +19156,17 @@ static PyObject *_wrap_ListEvent_m_col_set(PyObject *self, PyObject *args, PyObj wxListEvent *arg1 = (wxListEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListEvent_m_col_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_col_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_col = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -17629,7 +19189,7 @@ static PyObject *_wrap_ListEvent_m_col_get(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_col); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17718,7 +19278,7 @@ static PyObject *_wrap_ListEvent_GetKeyCode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17743,7 +19303,7 @@ static PyObject *_wrap_ListEvent_GetIndex(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17768,7 +19328,7 @@ static PyObject *_wrap_ListEvent_GetColumn(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17890,7 +19450,7 @@ static PyObject *_wrap_ListEvent_GetImage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17915,7 +19475,7 @@ static PyObject *_wrap_ListEvent_GetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17940,7 +19500,7 @@ static PyObject *_wrap_ListEvent_GetMask(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -17993,7 +19553,7 @@ static PyObject *_wrap_ListEvent_GetCacheFrom(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18018,7 +19578,7 @@ static PyObject *_wrap_ListEvent_GetCacheTo(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18043,7 +19603,7 @@ static PyObject *_wrap_ListEvent_IsEditCancelled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18063,7 +19623,7 @@ static PyObject *_wrap_ListEvent_SetEditCanceled(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_SetEditCanceled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18105,16 +19665,24 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_ListCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_ListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -18127,6 +19695,12 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -18204,17 +19778,25 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:ListCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:ListCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -18227,6 +19809,12 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -18247,7 +19835,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -18317,7 +19905,7 @@ static PyObject *_wrap_ListCtrl_SetForegroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18349,7 +19937,7 @@ static PyObject *_wrap_ListCtrl_SetBackgroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18362,12 +19950,17 @@ static PyObject *_wrap_ListCtrl_GetColumn(PyObject *self, PyObject *args, PyObje int arg2 ; wxListItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListCtrl_GetColumn",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxListItem *)wxPyListCtrl_GetColumn(arg1,arg2); @@ -18391,13 +19984,18 @@ static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObje wxListItem *arg3 = 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ListCtrl_SetColumn",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -18409,7 +20007,7 @@ static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18422,12 +20020,17 @@ static PyObject *_wrap_ListCtrl_GetColumnWidth(PyObject *self, PyObject *args, P int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListCtrl_GetColumnWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyListCtrl const *)arg1)->GetColumnWidth(arg2); @@ -18435,7 +20038,7 @@ static PyObject *_wrap_ListCtrl_GetColumnWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18449,12 +20052,22 @@ static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, P int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ListCtrl_SetColumnWidth",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetColumnWidth(arg2,arg3); @@ -18462,7 +20075,7 @@ static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18487,7 +20100,7 @@ static PyObject *_wrap_ListCtrl_GetCountPerPage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18557,12 +20170,24 @@ static PyObject *_wrap_ListCtrl_GetItem(PyObject *self, PyObject *args, PyObject int arg3 = (int) 0 ; wxListItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "itemId",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|i:ListCtrl_GetItem",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_GetItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxListItem *)wxPyListCtrl_GetItem(arg1,arg2,arg3); @@ -18603,7 +20228,7 @@ static PyObject *_wrap_ListCtrl_SetItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18620,18 +20245,35 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py long result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "col",(char *) "label",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OliO|i:ListCtrl_SetStringItem",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:ListCtrl_SetStringItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->SetItem(arg2,arg3,(wxString const &)*arg4,arg5); @@ -18639,7 +20281,7 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp4) delete arg4; @@ -18661,12 +20303,22 @@ static PyObject *_wrap_ListCtrl_GetItemState(PyObject *self, PyObject *args, PyO long arg3 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "stateMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ListCtrl_GetItemState",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_GetItemState",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyListCtrl const *)arg1)->GetItemState(arg2,arg3); @@ -18674,7 +20326,7 @@ static PyObject *_wrap_ListCtrl_GetItemState(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18689,12 +20341,27 @@ static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyO long arg4 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "state",(char *) "stateMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Olll:ListCtrl_SetItemState",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_SetItemState",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetItemState(arg2,arg3,arg4); @@ -18702,7 +20369,7 @@ static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18717,12 +20384,27 @@ static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyO int arg4 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "image",(char *) "selImage", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Olii:ListCtrl_SetItemImage",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_SetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetItemImage(arg2,arg3,arg4); @@ -18730,7 +20412,7 @@ static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18743,12 +20425,17 @@ static PyObject *_wrap_ListCtrl_GetItemText(PyObject *self, PyObject *args, PyOb long arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyListCtrl const *)arg1)->GetItemText(arg2); @@ -18776,13 +20463,18 @@ static PyObject *_wrap_ListCtrl_SetItemText(PyObject *self, PyObject *args, PyOb wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "str", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_SetItemText",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -18816,12 +20508,17 @@ static PyObject *_wrap_ListCtrl_GetItemData(PyObject *self, PyObject *args, PyOb long arg2 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemData",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxPyListCtrl const *)arg1)->GetItemData(arg2); @@ -18829,7 +20526,7 @@ static PyObject *_wrap_ListCtrl_GetItemData(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18843,12 +20540,22 @@ static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyOb long arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ListCtrl_SetItemData",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemData",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetItemData(arg2,arg3); @@ -18856,7 +20563,7 @@ static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18869,12 +20576,17 @@ static PyObject *_wrap_ListCtrl_GetItemPosition(PyObject *self, PyObject *args, long arg2 ; wxPoint result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxPyListCtrl_GetItemPosition(arg1,arg2); @@ -18900,12 +20612,24 @@ static PyObject *_wrap_ListCtrl_GetItemRect(PyObject *self, PyObject *args, PyOb int arg3 = (int) wxLIST_RECT_BOUNDS ; wxRect result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "code", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|i:ListCtrl_GetItemRect",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_GetItemRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxPyListCtrl_GetItemRect(arg1,arg2,arg3); @@ -18932,13 +20656,18 @@ static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args, bool result; wxPoint temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_SetItemPosition",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; @@ -18950,7 +20679,7 @@ static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18975,7 +20704,7 @@ static PyObject *_wrap_ListCtrl_GetItemCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19000,7 +20729,7 @@ static PyObject *_wrap_ListCtrl_GetColumnCount(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19054,7 +20783,7 @@ static PyObject *_wrap_ListCtrl_GetSelectedItemCount(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19139,7 +20868,7 @@ static PyObject *_wrap_ListCtrl_GetTopItem(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19152,16 +20881,21 @@ static PyObject *_wrap_ListCtrl_SetSingleStyle(PyObject *self, PyObject *args, P long arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style",(char *) "add", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|O:ListCtrl_SetSingleStyle",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_SetSingleStyle",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -19184,12 +20918,17 @@ static PyObject *_wrap_ListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *arg wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_SetWindowStyleFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindowStyleFlag(arg2); @@ -19212,12 +20951,31 @@ static PyObject *_wrap_ListCtrl_GetNextItem(PyObject *self, PyObject *args, PyOb int arg4 = (int) wxLIST_STATE_DONTCARE ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "geometry",(char *) "state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:ListCtrl_GetNextItem",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:ListCtrl_GetNextItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxPyListCtrl const *)arg1)->GetNextItem(arg2,arg3,arg4); @@ -19225,7 +20983,7 @@ static PyObject *_wrap_ListCtrl_GetNextItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19238,12 +20996,17 @@ static PyObject *_wrap_ListCtrl_GetImageList(PyObject *self, PyObject *args, PyO int arg2 ; wxImageList *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListCtrl_GetImageList",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetImageList",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImageList *)((wxPyListCtrl const *)arg1)->GetImageList(arg2); @@ -19267,13 +21030,18 @@ static PyObject *_wrap_ListCtrl_SetImageList(PyObject *self, PyObject *args, PyO int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "imageList",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListCtrl_SetImageList",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetImageList",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetImageList(arg2,arg3); @@ -19295,13 +21063,18 @@ static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args, int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "imageList",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:ListCtrl_AssignImageList",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_AssignImageList",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2,arg3); @@ -19334,7 +21107,7 @@ static PyObject *_wrap_ListCtrl_IsVirtual(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19346,12 +21119,17 @@ static PyObject *_wrap_ListCtrl_RefreshItem(PyObject *self, PyObject *args, PyOb wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_RefreshItem",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_RefreshItem",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RefreshItem(arg2); @@ -19372,12 +21150,22 @@ static PyObject *_wrap_ListCtrl_RefreshItems(PyObject *self, PyObject *args, PyO long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "itemFrom",(char *) "itemTo", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ListCtrl_RefreshItems",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_RefreshItems",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RefreshItems(arg2,arg3); @@ -19398,12 +21186,19 @@ static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject int arg2 = (int) wxLIST_ALIGN_DEFAULT ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:ListCtrl_Arrange",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ListCtrl_Arrange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Arrange(arg2); @@ -19411,7 +21206,7 @@ static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19424,12 +21219,17 @@ static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObj long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_DeleteItem",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_DeleteItem",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteItem(arg2); @@ -19437,7 +21237,7 @@ static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19462,7 +21262,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllItems(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19475,12 +21275,17 @@ static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyO int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListCtrl_DeleteColumn",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_DeleteColumn",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteColumn(arg2); @@ -19488,7 +21293,7 @@ static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19513,7 +21318,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllColumns(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19550,12 +21355,17 @@ static PyObject *_wrap_ListCtrl_EditLabel(PyObject *self, PyObject *args, PyObje long arg2 ; wxTextCtrl *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_EditLabel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_EditLabel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTextCtrl *)(arg1)->EditLabel(arg2); @@ -19586,7 +21396,7 @@ static PyObject *_wrap_ListCtrl_EndEditLabel(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_EndEditLabel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -19596,7 +21406,7 @@ static PyObject *_wrap_ListCtrl_EndEditLabel(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19609,12 +21419,17 @@ static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, Py long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_EnsureVisible",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_EnsureVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->EnsureVisible(arg2); @@ -19622,7 +21437,7 @@ static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19638,14 +21453,19 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec long result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "str",(char *) "partial", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|O:ListCtrl_FindItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ListCtrl_FindItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -19653,7 +21473,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -19664,7 +21484,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp3) delete arg3; @@ -19686,12 +21506,22 @@ static PyObject *_wrap_ListCtrl_FindItemData(PyObject *self, PyObject *args, PyO long arg3 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:ListCtrl_FindItemData",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_FindItemData",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->FindItem(arg2,arg3); @@ -19699,7 +21529,7 @@ static PyObject *_wrap_ListCtrl_FindItemData(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19715,17 +21545,27 @@ static PyObject *_wrap_ListCtrl_FindItemAtPos(PyObject *self, PyObject *args, Py long result; wxPoint temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "pt",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlOi:ListCtrl_FindItemAtPos",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_FindItemAtPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->FindItem(arg2,(wxPoint const &)*arg3,arg4); @@ -19733,7 +21573,7 @@ static PyObject *_wrap_ListCtrl_FindItemAtPos(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19768,7 +21608,7 @@ static PyObject *_wrap_ListCtrl_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -19803,7 +21643,7 @@ static PyObject *_wrap_ListCtrl_InsertItem(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19818,13 +21658,18 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args, long result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_InsertStringItem",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertStringItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -19837,7 +21682,7 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp3) delete arg3; @@ -19859,12 +21704,22 @@ static PyObject *_wrap_ListCtrl_InsertImageItem(PyObject *self, PyObject *args, int arg3 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "imageIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oli:ListCtrl_InsertImageItem",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertImageItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->InsertItem(arg2,arg3); @@ -19872,7 +21727,7 @@ static PyObject *_wrap_ListCtrl_InsertImageItem(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19888,18 +21743,28 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject * long result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "label",(char *) "imageIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlOi:ListCtrl_InsertImageStringItem",kwnames,&obj0,&arg2,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_InsertImageStringItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; temp3 = True; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->InsertItem(arg2,(wxString const &)*arg3,arg4); @@ -19907,7 +21772,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp3) delete arg3; @@ -19929,13 +21794,18 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *self, PyObject *args, wxListItem *arg3 = 0 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -19947,7 +21817,7 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -19964,18 +21834,37 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO long result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "heading",(char *) "format",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|ii:ListCtrl_InsertColumn",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:ListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->InsertColumn(arg2,(wxString const &)*arg3,arg4,arg5); @@ -19983,7 +21872,7 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp3) delete arg3; @@ -20003,12 +21892,17 @@ static PyObject *_wrap_ListCtrl_SetItemCount(PyObject *self, PyObject *args, PyO wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "count", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_SetItemCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_SetItemCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetItemCount(arg2); @@ -20030,12 +21924,22 @@ static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObj int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ListCtrl_ScrollList",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_ScrollList",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollList(arg2,arg3); @@ -20043,7 +21947,7 @@ static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20057,13 +21961,18 @@ static PyObject *_wrap_ListCtrl_SetItemTextColour(PyObject *self, PyObject *args wxColour *arg3 = 0 ; wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_SetItemTextColour",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; @@ -20088,12 +21997,17 @@ static PyObject *_wrap_ListCtrl_GetItemTextColour(PyObject *self, PyObject *args long arg2 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemTextColour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyListCtrl const *)arg1)->GetItemTextColour(arg2); @@ -20119,13 +22033,18 @@ static PyObject *_wrap_ListCtrl_SetItemBackgroundColour(PyObject *self, PyObject wxColour *arg3 = 0 ; wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO:ListCtrl_SetItemBackgroundColour",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; @@ -20150,12 +22069,17 @@ static PyObject *_wrap_ListCtrl_GetItemBackgroundColour(PyObject *self, PyObject long arg2 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListCtrl_GetItemBackgroundColour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyListCtrl const *)arg1)->GetItemBackgroundColour(arg2); @@ -20195,7 +22119,7 @@ static PyObject *_wrap_ListCtrl_SortItems(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20254,16 +22178,24 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_ListView",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_ListView",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -20276,6 +22208,12 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -20353,17 +22291,25 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:ListView_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:ListView_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -20376,6 +22322,12 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -20396,7 +22348,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -20417,16 +22369,21 @@ static PyObject *_wrap_ListView_Select(PyObject *self, PyObject *args, PyObject long arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "on", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|O:ListView_Select",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListView_Select",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -20449,12 +22406,17 @@ static PyObject *_wrap_ListView_Focus(PyObject *self, PyObject *args, PyObject * wxListView *arg1 = (wxListView *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListView_Focus",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_Focus",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Focus(arg2); @@ -20487,7 +22449,7 @@ static PyObject *_wrap_ListView_GetFocusedItem(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -20500,12 +22462,17 @@ static PyObject *_wrap_ListView_GetNextSelected(PyObject *self, PyObject *args, long arg2 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListView_GetNextSelected",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_GetNextSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)((wxListView const *)arg1)->GetNextSelected(arg2); @@ -20513,7 +22480,7 @@ static PyObject *_wrap_ListView_GetNextSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -20538,7 +22505,7 @@ static PyObject *_wrap_ListView_GetFirstSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -20551,12 +22518,17 @@ static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObj long arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ListView_IsSelected",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_IsSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsSelected(arg2); @@ -20564,7 +22536,7 @@ static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20577,12 +22549,22 @@ static PyObject *_wrap_ListView_SetColumnImage(PyObject *self, PyObject *args, P int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "image", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ListView_SetColumnImage",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListView_SetColumnImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumnImage(arg2,arg3); @@ -20602,12 +22584,17 @@ static PyObject *_wrap_ListView_ClearColumnImage(PyObject *self, PyObject *args, wxListView *arg1 = (wxListView *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ListView_ClearColumnImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_ClearColumnImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListView,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ClearColumnImage(arg2); @@ -20629,7 +22616,7 @@ static PyObject * ListView_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TreeCtrlNameStr_set(PyObject *_val) { +static int _wrap_TreeCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TreeCtrlNameStr is read-only."); return 1; } @@ -20713,7 +22700,7 @@ static PyObject *_wrap_TreeItemId_IsOk(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20741,7 +22728,7 @@ static PyObject *_wrap_TreeItemId___eq__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20769,7 +22756,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20998,11 +22985,25 @@ static PyObject *_wrap_new_TreeEvent(PyObject *self, PyObject *args, PyObject *k wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxTreeEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_TreeEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TreeEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTreeEvent *)new wxTreeEvent(arg1,arg2); @@ -21241,7 +23242,7 @@ static PyObject *_wrap_TreeEvent_GetKeyCode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21370,7 +23371,7 @@ static PyObject *_wrap_TreeEvent_IsEditCancelled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21390,7 +23391,7 @@ static PyObject *_wrap_TreeEvent_SetEditCanceled(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeEvent_SetEditCanceled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -21472,16 +23473,24 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlOO:new_TreeCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -21490,8 +23499,14 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw } if (obj3) { { - arg4 = &temp4; - if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; } } if (obj5) { @@ -21575,17 +23590,25 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlOO:TreeCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:TreeCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -21598,6 +23621,12 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -21618,7 +23647,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -21681,7 +23710,7 @@ static PyObject *_wrap_TreeCtrl_GetCount(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -21706,7 +23735,7 @@ static PyObject *_wrap_TreeCtrl_GetIndent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -21726,7 +23755,7 @@ static PyObject *_wrap_TreeCtrl_SetIndent(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SetIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -21761,7 +23790,7 @@ static PyObject *_wrap_TreeCtrl_GetSpacing(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -21781,7 +23810,7 @@ static PyObject *_wrap_TreeCtrl_SetSpacing(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SetSpacing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -22005,16 +24034,23 @@ static PyObject *_wrap_TreeCtrl_GetItemImage(PyObject *self, PyObject *args, PyO int result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:TreeCtrl_GetItemImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeCtrl_GetItemImage",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (wxTreeItemIcon) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyTreeCtrl const *)arg1)->GetItemImage((wxTreeItemId const &)*arg2,(wxTreeItemIcon )arg3); @@ -22022,7 +24058,7 @@ static PyObject *_wrap_TreeCtrl_GetItemImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22250,16 +24286,28 @@ static PyObject *_wrap_TreeCtrl_SetItemImage(PyObject *self, PyObject *args, PyO int arg4 = (int) wxTreeItemIcon_Normal ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "image",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|i:TreeCtrl_SetItemImage",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:TreeCtrl_SetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (wxTreeItemIcon) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetItemImage((wxTreeItemId const &)*arg2,arg3,(wxTreeItemIcon )arg4); @@ -22360,7 +24408,7 @@ static PyObject *_wrap_TreeCtrl_SetItemHasChildren(PyObject *self, PyObject *arg } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22398,7 +24446,7 @@ static PyObject *_wrap_TreeCtrl_SetItemBold(PyObject *self, PyObject *args, PyOb } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22436,7 +24484,7 @@ static PyObject *_wrap_TreeCtrl_SetItemDropHighlight(PyObject *self, PyObject *a } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22588,7 +24636,7 @@ static PyObject *_wrap_TreeCtrl_IsVisible(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22619,7 +24667,7 @@ static PyObject *_wrap_TreeCtrl_ItemHasChildren(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22650,7 +24698,7 @@ static PyObject *_wrap_TreeCtrl_IsExpanded(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22681,7 +24729,7 @@ static PyObject *_wrap_TreeCtrl_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22712,7 +24760,7 @@ static PyObject *_wrap_TreeCtrl_IsBold(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22740,7 +24788,7 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args, } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -22751,7 +24799,7 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -23156,18 +25204,32 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *self, PyObject *args, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiO:TreeCtrl_AddRoot",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:TreeCtrl_AddRoot",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -23210,12 +25272,14 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiO:TreeCtrl_PrependItem",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:TreeCtrl_PrependItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -23226,6 +25290,18 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyOb if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -23270,12 +25346,14 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObj PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "idPrevious",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iiO:TreeCtrl_InsertItem",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:TreeCtrl_InsertItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -23290,6 +25368,18 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObj if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -23334,19 +25424,21 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args, PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "index",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iiO:TreeCtrl_InsertItemBefore",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:TreeCtrl_InsertItemBefore",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -23354,6 +25446,18 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args, if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -23396,12 +25500,14 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObj PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "text",(char *) "image",(char *) "selectedImage",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|iiO:TreeCtrl_AppendItem",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:TreeCtrl_AppendItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -23412,6 +25518,18 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObj if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -23860,7 +25978,7 @@ static PyObject *_wrap_TreeCtrl_EndEditLabel(PyObject *self, PyObject *args, PyO } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -23972,7 +26090,7 @@ static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args, } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -23997,7 +26115,7 @@ static PyObject * TreeCtrl_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_DirDialogDefaultFolderStr_set(PyObject *_val) { +static int _wrap_DirDialogDefaultFolderStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DirDialogDefaultFolderStr is read-only."); return 1; } @@ -24040,17 +26158,26 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje bool temp7 = False ; bool temp9 = 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 ; PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "dir",(char *) "pos",(char *) "size",(char *) "style",(char *) "filter",(char *) "defaultFilter",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOOlOiO:new_GenericDirCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&arg8,&obj8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOOO:new_GenericDirCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -24070,6 +26197,12 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -24077,6 +26210,12 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje temp7 = True; } } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj8) { { arg9 = wxString_in_helper(obj8); @@ -24169,18 +26308,27 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO bool temp10 = 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 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "dir",(char *) "pos",(char *) "size",(char *) "style",(char *) "filter",(char *) "defaultFilter",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOOlOiO:GenericDirCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7,&arg9,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOOOO:GenericDirCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -24200,6 +26348,12 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -24207,6 +26361,12 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO temp8 = True; } } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { { arg10 = wxString_in_helper(obj9); @@ -24221,7 +26381,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -24278,7 +26438,7 @@ static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -24479,7 +26639,7 @@ static PyObject *_wrap_GenericDirCtrl_ShowHidden(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GenericDirCtrl_ShowHidden",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -24514,7 +26674,7 @@ static PyObject *_wrap_GenericDirCtrl_GetShowHidden(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24610,7 +26770,7 @@ static PyObject *_wrap_GenericDirCtrl_GetFilterIndex(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24622,12 +26782,17 @@ static PyObject *_wrap_GenericDirCtrl_SetFilterIndex(PyObject *self, PyObject *a wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GenericDirCtrl_SetFilterIndex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GenericDirCtrl_SetFilterIndex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFilterIndex(arg2); @@ -24848,14 +27013,22 @@ static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyO wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_DirFilterListCtrl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_DirFilterListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -24868,6 +27041,12 @@ static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDirFilterListCtrl *)new wxDirFilterListCtrl(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -24919,15 +27098,23 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, wxSize temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOl:DirFilterListCtrl_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:DirFilterListCtrl_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDirFilterListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGenericDirCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -24940,6 +27127,12 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6); @@ -24947,7 +27140,7 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24962,17 +27155,22 @@ static PyObject *_wrap_DirFilterListCtrl_FillFilterList(PyObject *self, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "filter",(char *) "defaultFilter", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:DirFilterListCtrl_FillFilterList",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DirFilterListCtrl_FillFilterList",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDirFilterListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->FillFilterList((wxString const &)*arg2,arg3); @@ -25020,16 +27218,22 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlOO:new_PyControl",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:new_PyControl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -25042,6 +27246,12 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -25115,12 +27325,32 @@ static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *self, PyObject *arg int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyControl_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyControl_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -25144,12 +27374,39 @@ static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *self, PyObject *args, int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyControl_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyControl_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -25170,12 +27427,22 @@ static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *self, PyObject * int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyControl_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -25196,12 +27463,22 @@ static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *self, PyObject int arg2 ; int 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 *)"Oii:PyControl_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -25430,7 +27707,7 @@ static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25455,7 +27732,7 @@ static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25480,7 +27757,7 @@ static PyObject *_wrap_PyControl_base_Validate(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25505,7 +27782,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25530,7 +27807,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25635,12 +27912,26 @@ static PyObject *_wrap_new_HelpEvent(PyObject *self, PyObject *args, PyObject *k wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxHelpEvent *result; wxPoint temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_HelpEvent",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_HelpEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -25892,7 +28183,7 @@ static PyObject *_wrap_new_ContextHelp(PyObject *self, PyObject *args, PyObject } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -25957,7 +28248,7 @@ static PyObject *_wrap_ContextHelp_BeginContextHelp(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25982,7 +28273,7 @@ static PyObject *_wrap_ContextHelp_EndContextHelp(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26009,14 +28300,22 @@ static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyO wxPoint temp3 ; wxSize temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOl:new_ContextHelpButton",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:new_ContextHelpButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -26029,6 +28328,12 @@ static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxContextHelpButton *)new wxContextHelpButton(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5); @@ -26152,7 +28457,7 @@ static PyObject *_wrap_HelpProvider_ShowHelp(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26209,13 +28514,18 @@ static PyObject *_wrap_HelpProvider_AddHelpById(PyObject *self, PyObject *args, wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:HelpProvider_AddHelpById",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HelpProvider_AddHelpById",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHelpProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26464,15 +28774,20 @@ static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject long arg2 ; wxGenericDragImage *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "listCtrl",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_DragListItem",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_DragListItem",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGenericDragImage *)new wxGenericDragImage((wxPyListCtrl const &)*arg1,arg2); @@ -26565,7 +28880,7 @@ static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -26579,7 +28894,7 @@ static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26617,7 +28932,7 @@ static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26642,7 +28957,7 @@ static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26674,7 +28989,7 @@ static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26699,7 +29014,7 @@ static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26724,7 +29039,7 @@ static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26798,7 +29113,7 @@ static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26849,7 +29164,7 @@ static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26886,11 +29201,11 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -26900,7 +29215,7 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -27039,6 +29354,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS }, { (char *)"new_TextAttr", _wrap_new_TextAttr, METH_VARARGS }, + { (char *)"delete_TextAttr", (PyCFunction) _wrap_delete_TextAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_SetBackgroundColour", (PyCFunction) _wrap_TextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, @@ -28757,6 +31073,7 @@ static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p static swig_type_info _swigt__p_wxContextHelpButton[] = {{"_p_wxContextHelpButton", 0, "wxContextHelpButton *", 0},{"_p_wxContextHelpButton"},{0}}; static swig_type_info _swigt__p_wxRadioBox[] = {{"_p_wxRadioBox", 0, "wxRadioBox *", 0},{"_p_wxRadioBox"},{0}}; static swig_type_info _swigt__p_wxScrollBar[] = {{"_p_wxScrollBar", 0, "wxScrollBar *", 0},{"_p_wxScrollBar"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0},{"_p_wxTreeItemId"},{0}}; static swig_type_info _swigt__p_wxComboBox[] = {{"_p_wxComboBox", 0, "wxComboBox *", 0},{"_p_wxComboBox"},{0}}; static swig_type_info _swigt__p_wxHelpEvent[] = {{"_p_wxHelpEvent", 0, "wxHelpEvent *", 0},{"_p_wxHelpEvent"},{0}}; @@ -28842,6 +31159,7 @@ _swigt__p_wxRect, _swigt__p_wxContextHelpButton, _swigt__p_wxRadioBox, _swigt__p_wxScrollBar, +_swigt__p_char, _swigt__p_wxTreeItemId, _swigt__p_wxComboBox, _swigt__p_wxHelpEvent, @@ -28880,256 +31198,6 @@ _swigt__p_wxValidator, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"BU_LEFT", (long) wxBU_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_TOP", (long) wxBU_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_RIGHT", (long) wxBU_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_BOTTOM", (long) wxBU_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_EXACTFIT", (long) wxBU_EXACTFIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BU_AUTODRAW", (long) wxBU_AUTODRAW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_2STATE", (long) wxCHK_2STATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_3STATE", (long) wxCHK_3STATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_ALLOW_3RD_STATE_FOR_USER", (long) wxCHK_ALLOW_3RD_STATE_FOR_USER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_UNCHECKED", (long) wxCHK_UNCHECKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_CHECKED", (long) wxCHK_CHECKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHK_UNDETERMINED", (long) wxCHK_UNDETERMINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GA_HORIZONTAL", (long) wxGA_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GA_VERTICAL", (long) wxGA_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GA_SMOOTH", (long) wxGA_SMOOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GA_PROGRESSBAR", (long) wxGA_PROGRESSBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_NO_VSCROLL", (long) wxTE_NO_VSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_AUTO_SCROLL", (long) wxTE_AUTO_SCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_READONLY", (long) wxTE_READONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_MULTILINE", (long) wxTE_MULTILINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_PROCESS_TAB", (long) wxTE_PROCESS_TAB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_LEFT", (long) wxTE_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_CENTER", (long) wxTE_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_RIGHT", (long) wxTE_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_CENTRE", (long) wxTE_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_RICH", (long) wxTE_RICH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_PROCESS_ENTER", (long) wxTE_PROCESS_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_PASSWORD", (long) wxTE_PASSWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_AUTO_URL", (long) wxTE_AUTO_URL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_NOHIDESEL", (long) wxTE_NOHIDESEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_DONTWRAP", (long) wxTE_DONTWRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_LINEWRAP", (long) wxTE_LINEWRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_WORDWRAP", (long) wxTE_WORDWRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TE_RICH2", (long) wxTE_RICH2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_DEFAULT", (long) wxTEXT_ALIGNMENT_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_LEFT", (long) wxTEXT_ALIGNMENT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_CENTRE", (long) wxTEXT_ALIGNMENT_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_CENTER", (long) wxTEXT_ALIGNMENT_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_RIGHT", (long) wxTEXT_ALIGNMENT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ALIGNMENT_JUSTIFIED", (long) wxTEXT_ALIGNMENT_JUSTIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_TEXT_COLOUR", (long) wxTEXT_ATTR_TEXT_COLOUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_BACKGROUND_COLOUR", (long) wxTEXT_ATTR_BACKGROUND_COLOUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_FACE", (long) wxTEXT_ATTR_FONT_FACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_SIZE", (long) wxTEXT_ATTR_FONT_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_WEIGHT", (long) wxTEXT_ATTR_FONT_WEIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_ITALIC", (long) wxTEXT_ATTR_FONT_ITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT_UNDERLINE", (long) wxTEXT_ATTR_FONT_UNDERLINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_FONT", (long) wxTEXT_ATTR_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_ALIGNMENT", (long) wxTEXT_ATTR_ALIGNMENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_LEFT_INDENT", (long) wxTEXT_ATTR_LEFT_INDENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_RIGHT_INDENT", (long) wxTEXT_ATTR_RIGHT_INDENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TEXT_ATTR_TABS", (long) wxTEXT_ATTR_TABS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TEXT_UPDATED", (long) wxEVT_COMMAND_TEXT_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TEXT_ENTER", (long) wxEVT_COMMAND_TEXT_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TEXT_URL", (long) wxEVT_COMMAND_TEXT_URL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TEXT_MAXLEN", (long) wxEVT_COMMAND_TEXT_MAXLEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_HORIZONTAL", (long) wxSP_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_VERTICAL", (long) wxSP_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_ARROW_KEYS", (long) wxSP_ARROW_KEYS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_WRAP", (long) wxSP_WRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPINCTRL_UPDATED", (long) wxEVT_COMMAND_SPINCTRL_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", (long) wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_FIXEDWIDTH", (long) wxNB_FIXEDWIDTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_TOP", (long) wxNB_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_LEFT", (long) wxNB_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_RIGHT", (long) wxNB_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_BOTTOM", (long) wxNB_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_MULTILINE", (long) wxNB_MULTILINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_HITTEST_NOWHERE", (long) wxNB_HITTEST_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_HITTEST_ONICON", (long) wxNB_HITTEST_ONICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_HITTEST_ONLABEL", (long) wxNB_HITTEST_ONLABEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NB_HITTEST_ONITEM", (long) wxNB_HITTEST_ONITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", (long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", (long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_DEFAULT", (long) wxLB_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_TOP", (long) wxLB_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_BOTTOM", (long) wxLB_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_LEFT", (long) wxLB_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_RIGHT", (long) wxLB_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_ALIGN_MASK", (long) wxLB_ALIGN_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED", (long) wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING", (long) wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_STYLE_BUTTON", (long) wxTOOL_STYLE_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_STYLE_SEPARATOR", (long) wxTOOL_STYLE_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_STYLE_CONTROL", (long) wxTOOL_STYLE_CONTROL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_HORIZONTAL", (long) wxTB_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_VERTICAL", (long) wxTB_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_3DBUTTONS", (long) wxTB_3DBUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_FLAT", (long) wxTB_FLAT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_DOCKABLE", (long) wxTB_DOCKABLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_NOICONS", (long) wxTB_NOICONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_TEXT", (long) wxTB_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_NODIVIDER", (long) wxTB_NODIVIDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_NOALIGN", (long) wxTB_NOALIGN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_HORZ_LAYOUT", (long) wxTB_HORZ_LAYOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TB_HORZ_TEXT", (long) wxTB_HORZ_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_VRULES", (long) wxLC_VRULES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_HRULES", (long) wxLC_HRULES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_ICON", (long) wxLC_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_SMALL_ICON", (long) wxLC_SMALL_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_LIST", (long) wxLC_LIST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_REPORT", (long) wxLC_REPORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_ALIGN_TOP", (long) wxLC_ALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_ALIGN_LEFT", (long) wxLC_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_AUTOARRANGE", (long) wxLC_AUTOARRANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_VIRTUAL", (long) wxLC_VIRTUAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_EDIT_LABELS", (long) wxLC_EDIT_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_NO_HEADER", (long) wxLC_NO_HEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_NO_SORT_HEADER", (long) wxLC_NO_SORT_HEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_SINGLE_SEL", (long) wxLC_SINGLE_SEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_SORT_ASCENDING", (long) wxLC_SORT_ASCENDING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_SORT_DESCENDING", (long) wxLC_SORT_DESCENDING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_MASK_TYPE", (long) wxLC_MASK_TYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_MASK_ALIGN", (long) wxLC_MASK_ALIGN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LC_MASK_SORT", (long) wxLC_MASK_SORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_STATE", (long) wxLIST_MASK_STATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_TEXT", (long) wxLIST_MASK_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_IMAGE", (long) wxLIST_MASK_IMAGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_DATA", (long) wxLIST_MASK_DATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_SET_ITEM", (long) wxLIST_SET_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_WIDTH", (long) wxLIST_MASK_WIDTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_MASK_FORMAT", (long) wxLIST_MASK_FORMAT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_DONTCARE", (long) wxLIST_STATE_DONTCARE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_DROPHILITED", (long) wxLIST_STATE_DROPHILITED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_FOCUSED", (long) wxLIST_STATE_FOCUSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_SELECTED", (long) wxLIST_STATE_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_CUT", (long) wxLIST_STATE_CUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_DISABLED", (long) wxLIST_STATE_DISABLED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_FILTERED", (long) wxLIST_STATE_FILTERED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_INUSE", (long) wxLIST_STATE_INUSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_PICKED", (long) wxLIST_STATE_PICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_STATE_SOURCE", (long) wxLIST_STATE_SOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ABOVE", (long) wxLIST_HITTEST_ABOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_BELOW", (long) wxLIST_HITTEST_BELOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_NOWHERE", (long) wxLIST_HITTEST_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEMICON", (long) wxLIST_HITTEST_ONITEMICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEMLABEL", (long) wxLIST_HITTEST_ONITEMLABEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEMRIGHT", (long) wxLIST_HITTEST_ONITEMRIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEMSTATEICON", (long) wxLIST_HITTEST_ONITEMSTATEICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_TOLEFT", (long) wxLIST_HITTEST_TOLEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_TORIGHT", (long) wxLIST_HITTEST_TORIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_HITTEST_ONITEM", (long) wxLIST_HITTEST_ONITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_ABOVE", (long) wxLIST_NEXT_ABOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_ALL", (long) wxLIST_NEXT_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_BELOW", (long) wxLIST_NEXT_BELOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_LEFT", (long) wxLIST_NEXT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_NEXT_RIGHT", (long) wxLIST_NEXT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_ALIGN_DEFAULT", (long) wxLIST_ALIGN_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_ALIGN_LEFT", (long) wxLIST_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_ALIGN_TOP", (long) wxLIST_ALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_ALIGN_SNAP_TO_GRID", (long) wxLIST_ALIGN_SNAP_TO_GRID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FORMAT_LEFT", (long) wxLIST_FORMAT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FORMAT_RIGHT", (long) wxLIST_FORMAT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FORMAT_CENTRE", (long) wxLIST_FORMAT_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FORMAT_CENTER", (long) wxLIST_FORMAT_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_AUTOSIZE", (long) wxLIST_AUTOSIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_AUTOSIZE_USEHEADER", (long) wxLIST_AUTOSIZE_USEHEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_RECT_BOUNDS", (long) wxLIST_RECT_BOUNDS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_RECT_ICON", (long) wxLIST_RECT_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_RECT_LABEL", (long) wxLIST_RECT_LABEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FIND_UP", (long) wxLIST_FIND_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FIND_DOWN", (long) wxLIST_FIND_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FIND_LEFT", (long) wxLIST_FIND_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIST_FIND_RIGHT", (long) wxLIST_FIND_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_BEGIN_DRAG", (long) wxEVT_COMMAND_LIST_BEGIN_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_BEGIN_RDRAG", (long) wxEVT_COMMAND_LIST_BEGIN_RDRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT", (long) wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_END_LABEL_EDIT", (long) wxEVT_COMMAND_LIST_END_LABEL_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_DELETE_ITEM", (long) wxEVT_COMMAND_LIST_DELETE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS", (long) wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_GET_INFO", (long) wxEVT_COMMAND_LIST_GET_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_SET_INFO", (long) wxEVT_COMMAND_LIST_SET_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_SELECTED", (long) wxEVT_COMMAND_LIST_ITEM_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_DESELECTED", (long) wxEVT_COMMAND_LIST_ITEM_DESELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_KEY_DOWN", (long) wxEVT_COMMAND_LIST_KEY_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_INSERT_ITEM", (long) wxEVT_COMMAND_LIST_INSERT_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_CLICK", (long) wxEVT_COMMAND_LIST_COL_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK", (long) wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK", (long) wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_ACTIVATED", (long) wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_CACHE_HINT", (long) wxEVT_COMMAND_LIST_CACHE_HINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_RIGHT_CLICK", (long) wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_BEGIN_DRAG", (long) wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_DRAGGING", (long) wxEVT_COMMAND_LIST_COL_DRAGGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_COL_END_DRAG", (long) wxEVT_COMMAND_LIST_COL_END_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LIST_ITEM_FOCUSED", (long) wxEVT_COMMAND_LIST_ITEM_FOCUSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_NO_BUTTONS", (long) wxTR_NO_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_HAS_BUTTONS", (long) wxTR_HAS_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_NO_LINES", (long) wxTR_NO_LINES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_LINES_AT_ROOT", (long) wxTR_LINES_AT_ROOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_SINGLE", (long) wxTR_SINGLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_MULTIPLE", (long) wxTR_MULTIPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_EXTENDED", (long) wxTR_EXTENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_HAS_VARIABLE_ROW_HEIGHT", (long) wxTR_HAS_VARIABLE_ROW_HEIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_EDIT_LABELS", (long) wxTR_EDIT_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_HIDE_ROOT", (long) wxTR_HIDE_ROOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_ROW_LINES", (long) wxTR_ROW_LINES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_FULL_ROW_HIGHLIGHT", (long) wxTR_FULL_ROW_HIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_DEFAULT_STYLE", (long) wxTR_DEFAULT_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_TWIST_BUTTONS", (long) wxTR_TWIST_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_MAC_BUTTONS", (long) wxTR_MAC_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TR_AQUA_BUTTONS", (long) wxTR_AQUA_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_Normal", (long) wxTreeItemIcon_Normal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_Selected", (long) wxTreeItemIcon_Selected, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_Expanded", (long) wxTreeItemIcon_Expanded, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_SelectedExpanded", (long) wxTreeItemIcon_SelectedExpanded, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TreeItemIcon_Max", (long) wxTreeItemIcon_Max, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ABOVE", (long) wxTREE_HITTEST_ABOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_BELOW", (long) wxTREE_HITTEST_BELOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_NOWHERE", (long) wxTREE_HITTEST_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMBUTTON", (long) wxTREE_HITTEST_ONITEMBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMICON", (long) wxTREE_HITTEST_ONITEMICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMINDENT", (long) wxTREE_HITTEST_ONITEMINDENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMLABEL", (long) wxTREE_HITTEST_ONITEMLABEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMRIGHT", (long) wxTREE_HITTEST_ONITEMRIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMSTATEICON", (long) wxTREE_HITTEST_ONITEMSTATEICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_TOLEFT", (long) wxTREE_HITTEST_TOLEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_TORIGHT", (long) wxTREE_HITTEST_TORIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMUPPERPART", (long) wxTREE_HITTEST_ONITEMUPPERPART, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEMLOWERPART", (long) wxTREE_HITTEST_ONITEMLOWERPART, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TREE_HITTEST_ONITEM", (long) wxTREE_HITTEST_ONITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_BEGIN_DRAG", (long) wxEVT_COMMAND_TREE_BEGIN_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_BEGIN_RDRAG", (long) wxEVT_COMMAND_TREE_BEGIN_RDRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT", (long) wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_END_LABEL_EDIT", (long) wxEVT_COMMAND_TREE_END_LABEL_EDIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_DELETE_ITEM", (long) wxEVT_COMMAND_TREE_DELETE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_GET_INFO", (long) wxEVT_COMMAND_TREE_GET_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_SET_INFO", (long) wxEVT_COMMAND_TREE_SET_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_EXPANDED", (long) wxEVT_COMMAND_TREE_ITEM_EXPANDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_EXPANDING", (long) wxEVT_COMMAND_TREE_ITEM_EXPANDING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_COLLAPSED", (long) wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_COLLAPSING", (long) wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_SEL_CHANGED", (long) wxEVT_COMMAND_TREE_SEL_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_SEL_CHANGING", (long) wxEVT_COMMAND_TREE_SEL_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_KEY_DOWN", (long) wxEVT_COMMAND_TREE_KEY_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_ACTIVATED", (long) wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK", (long) wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK", (long) wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_END_DRAG", (long) wxEVT_COMMAND_TREE_END_DRAG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK", (long) wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP", (long) wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_DIR_ONLY", (long) wxDIRCTRL_DIR_ONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_SELECT_FIRST", (long) wxDIRCTRL_SELECT_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_SHOW_FILTERS", (long) wxDIRCTRL_SHOW_FILTERS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_3D_INTERNAL", (long) wxDIRCTRL_3D_INTERNAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIRCTRL_EDIT_LABELS", (long) wxDIRCTRL_EDIT_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_EX_CONTEXTHELP", (long) wxFRAME_EX_CONTEXTHELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_EX_CONTEXTHELP", (long) wxDIALOG_EX_CONTEXTHELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_HELP", (long) wxEVT_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DETAILED_HELP", (long) wxEVT_DETAILED_HELP, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -29158,15 +31226,67 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"ButtonNameStr",_wrap_ButtonNameStr_get, _wrap_ButtonNameStr_set); + PyDict_SetItemString(d,"BU_LEFT", SWIG_PyObj_FromInt((int)wxBU_LEFT)); + PyDict_SetItemString(d,"BU_TOP", SWIG_PyObj_FromInt((int)wxBU_TOP)); + PyDict_SetItemString(d,"BU_RIGHT", SWIG_PyObj_FromInt((int)wxBU_RIGHT)); + PyDict_SetItemString(d,"BU_BOTTOM", SWIG_PyObj_FromInt((int)wxBU_BOTTOM)); + PyDict_SetItemString(d,"BU_EXACTFIT", SWIG_PyObj_FromInt((int)wxBU_EXACTFIT)); + PyDict_SetItemString(d,"BU_AUTODRAW", SWIG_PyObj_FromInt((int)wxBU_AUTODRAW)); SWIG_addvarlink(SWIG_globals,(char*)"CheckBoxNameStr",_wrap_CheckBoxNameStr_get, _wrap_CheckBoxNameStr_set); + PyDict_SetItemString(d,"CHK_2STATE", SWIG_PyObj_FromInt((int)wxCHK_2STATE)); + PyDict_SetItemString(d,"CHK_3STATE", SWIG_PyObj_FromInt((int)wxCHK_3STATE)); + PyDict_SetItemString(d,"CHK_ALLOW_3RD_STATE_FOR_USER", SWIG_PyObj_FromInt((int)wxCHK_ALLOW_3RD_STATE_FOR_USER)); + PyDict_SetItemString(d,"CHK_UNCHECKED", SWIG_PyObj_FromInt((int)wxCHK_UNCHECKED)); + PyDict_SetItemString(d,"CHK_CHECKED", SWIG_PyObj_FromInt((int)wxCHK_CHECKED)); + PyDict_SetItemString(d,"CHK_UNDETERMINED", SWIG_PyObj_FromInt((int)wxCHK_UNDETERMINED)); SWIG_addvarlink(SWIG_globals,(char*)"ChoiceNameStr",_wrap_ChoiceNameStr_get, _wrap_ChoiceNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"ComboBoxNameStr",_wrap_ComboBoxNameStr_get, _wrap_ComboBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"GaugeNameStr",_wrap_GaugeNameStr_get, _wrap_GaugeNameStr_set); + PyDict_SetItemString(d,"GA_HORIZONTAL", SWIG_PyObj_FromInt((int)wxGA_HORIZONTAL)); + PyDict_SetItemString(d,"GA_VERTICAL", SWIG_PyObj_FromInt((int)wxGA_VERTICAL)); + PyDict_SetItemString(d,"GA_SMOOTH", SWIG_PyObj_FromInt((int)wxGA_SMOOTH)); + PyDict_SetItemString(d,"GA_PROGRESSBAR", SWIG_PyObj_FromInt((int)wxGA_PROGRESSBAR)); SWIG_addvarlink(SWIG_globals,(char*)"StaticBitmapNameStr",_wrap_StaticBitmapNameStr_get, _wrap_StaticBitmapNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"StaticBoxNameStr",_wrap_StaticBoxNameStr_get, _wrap_StaticBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"StaticTextNameStr",_wrap_StaticTextNameStr_get, _wrap_StaticTextNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"ListBoxNameStr",_wrap_ListBoxNameStr_get, _wrap_ListBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"TextCtrlNameStr",_wrap_TextCtrlNameStr_get, _wrap_TextCtrlNameStr_set); + PyDict_SetItemString(d,"TE_NO_VSCROLL", SWIG_PyObj_FromInt((int)wxTE_NO_VSCROLL)); + PyDict_SetItemString(d,"TE_AUTO_SCROLL", SWIG_PyObj_FromInt((int)wxTE_AUTO_SCROLL)); + PyDict_SetItemString(d,"TE_READONLY", SWIG_PyObj_FromInt((int)wxTE_READONLY)); + PyDict_SetItemString(d,"TE_MULTILINE", SWIG_PyObj_FromInt((int)wxTE_MULTILINE)); + PyDict_SetItemString(d,"TE_PROCESS_TAB", SWIG_PyObj_FromInt((int)wxTE_PROCESS_TAB)); + PyDict_SetItemString(d,"TE_LEFT", SWIG_PyObj_FromInt((int)wxTE_LEFT)); + PyDict_SetItemString(d,"TE_CENTER", SWIG_PyObj_FromInt((int)wxTE_CENTER)); + PyDict_SetItemString(d,"TE_RIGHT", SWIG_PyObj_FromInt((int)wxTE_RIGHT)); + PyDict_SetItemString(d,"TE_CENTRE", SWIG_PyObj_FromInt((int)wxTE_CENTRE)); + PyDict_SetItemString(d,"TE_RICH", SWIG_PyObj_FromInt((int)wxTE_RICH)); + PyDict_SetItemString(d,"TE_PROCESS_ENTER", SWIG_PyObj_FromInt((int)wxTE_PROCESS_ENTER)); + PyDict_SetItemString(d,"TE_PASSWORD", SWIG_PyObj_FromInt((int)wxTE_PASSWORD)); + PyDict_SetItemString(d,"TE_AUTO_URL", SWIG_PyObj_FromInt((int)wxTE_AUTO_URL)); + PyDict_SetItemString(d,"TE_NOHIDESEL", SWIG_PyObj_FromInt((int)wxTE_NOHIDESEL)); + PyDict_SetItemString(d,"TE_DONTWRAP", SWIG_PyObj_FromInt((int)wxTE_DONTWRAP)); + PyDict_SetItemString(d,"TE_LINEWRAP", SWIG_PyObj_FromInt((int)wxTE_LINEWRAP)); + PyDict_SetItemString(d,"TE_WORDWRAP", SWIG_PyObj_FromInt((int)wxTE_WORDWRAP)); + PyDict_SetItemString(d,"TE_RICH2", SWIG_PyObj_FromInt((int)wxTE_RICH2)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_DEFAULT)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_LEFT", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_LEFT)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_CENTRE", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_CENTRE)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_CENTER", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_CENTER)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_RIGHT", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_RIGHT)); + PyDict_SetItemString(d,"TEXT_ALIGNMENT_JUSTIFIED", SWIG_PyObj_FromInt((int)wxTEXT_ALIGNMENT_JUSTIFIED)); + PyDict_SetItemString(d,"TEXT_ATTR_TEXT_COLOUR", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_TEXT_COLOUR)); + PyDict_SetItemString(d,"TEXT_ATTR_BACKGROUND_COLOUR", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_BACKGROUND_COLOUR)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_FACE", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_FACE)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_SIZE", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_SIZE)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_WEIGHT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_WEIGHT)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_ITALIC", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_ITALIC)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT_UNDERLINE", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT_UNDERLINE)); + PyDict_SetItemString(d,"TEXT_ATTR_FONT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_FONT)); + PyDict_SetItemString(d,"TEXT_ATTR_ALIGNMENT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_ALIGNMENT)); + PyDict_SetItemString(d,"TEXT_ATTR_LEFT_INDENT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_LEFT_INDENT)); + PyDict_SetItemString(d,"TEXT_ATTR_RIGHT_INDENT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_RIGHT_INDENT)); + PyDict_SetItemString(d,"TEXT_ATTR_TABS", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_TABS)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_UPDATED", PyInt_FromLong(wxEVT_COMMAND_TEXT_UPDATED)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_ENTER", PyInt_FromLong(wxEVT_COMMAND_TEXT_ENTER)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_URL", PyInt_FromLong(wxEVT_COMMAND_TEXT_URL)); @@ -29174,6 +31294,10 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ScrollBarNameStr",_wrap_ScrollBarNameStr_get, _wrap_ScrollBarNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"SPIN_BUTTON_NAME",_wrap_SPIN_BUTTON_NAME_get, _wrap_SPIN_BUTTON_NAME_set); SWIG_addvarlink(SWIG_globals,(char*)"SpinCtrlNameStr",_wrap_SpinCtrlNameStr_get, _wrap_SpinCtrlNameStr_set); + PyDict_SetItemString(d,"SP_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSP_HORIZONTAL)); + PyDict_SetItemString(d,"SP_VERTICAL", SWIG_PyObj_FromInt((int)wxSP_VERTICAL)); + PyDict_SetItemString(d,"SP_ARROW_KEYS", SWIG_PyObj_FromInt((int)wxSP_ARROW_KEYS)); + PyDict_SetItemString(d,"SP_WRAP", SWIG_PyObj_FromInt((int)wxSP_WRAP)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPINCTRL_UPDATED", PyInt_FromLong(wxEVT_COMMAND_SPINCTRL_UPDATED)); SWIG_addvarlink(SWIG_globals,(char*)"RadioBoxNameStr",_wrap_RadioBoxNameStr_get, _wrap_RadioBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"RadioButtonNameStr",_wrap_RadioButtonNameStr_get, _wrap_RadioButtonNameStr_set); @@ -29181,11 +31305,109 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ToggleButtonNameStr",_wrap_ToggleButtonNameStr_get, _wrap_ToggleButtonNameStr_set); PyDict_SetItemString(d, "wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)); SWIG_addvarlink(SWIG_globals,(char*)"NOTEBOOK_NAME",_wrap_NOTEBOOK_NAME_get, _wrap_NOTEBOOK_NAME_set); + PyDict_SetItemString(d,"NB_FIXEDWIDTH", SWIG_PyObj_FromInt((int)wxNB_FIXEDWIDTH)); + PyDict_SetItemString(d,"NB_TOP", SWIG_PyObj_FromInt((int)wxNB_TOP)); + PyDict_SetItemString(d,"NB_LEFT", SWIG_PyObj_FromInt((int)wxNB_LEFT)); + PyDict_SetItemString(d,"NB_RIGHT", SWIG_PyObj_FromInt((int)wxNB_RIGHT)); + PyDict_SetItemString(d,"NB_BOTTOM", SWIG_PyObj_FromInt((int)wxNB_BOTTOM)); + PyDict_SetItemString(d,"NB_MULTILINE", SWIG_PyObj_FromInt((int)wxNB_MULTILINE)); + PyDict_SetItemString(d,"NB_HITTEST_NOWHERE", SWIG_PyObj_FromInt((int)wxNB_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"NB_HITTEST_ONICON", SWIG_PyObj_FromInt((int)wxNB_HITTEST_ONICON)); + PyDict_SetItemString(d,"NB_HITTEST_ONLABEL", SWIG_PyObj_FromInt((int)wxNB_HITTEST_ONLABEL)); + PyDict_SetItemString(d,"NB_HITTEST_ONITEM", SWIG_PyObj_FromInt((int)wxNB_HITTEST_ONITEM)); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d,"LB_DEFAULT", SWIG_PyObj_FromInt((int)wxLB_DEFAULT)); + PyDict_SetItemString(d,"LB_TOP", SWIG_PyObj_FromInt((int)wxLB_TOP)); + PyDict_SetItemString(d,"LB_BOTTOM", SWIG_PyObj_FromInt((int)wxLB_BOTTOM)); + PyDict_SetItemString(d,"LB_LEFT", SWIG_PyObj_FromInt((int)wxLB_LEFT)); + PyDict_SetItemString(d,"LB_RIGHT", SWIG_PyObj_FromInt((int)wxLB_RIGHT)); + PyDict_SetItemString(d,"LB_ALIGN_MASK", SWIG_PyObj_FromInt((int)wxLB_ALIGN_MASK)); PyDict_SetItemString(d, "wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d,"TOOL_STYLE_BUTTON", SWIG_PyObj_FromInt((int)wxTOOL_STYLE_BUTTON)); + PyDict_SetItemString(d,"TOOL_STYLE_SEPARATOR", SWIG_PyObj_FromInt((int)wxTOOL_STYLE_SEPARATOR)); + PyDict_SetItemString(d,"TOOL_STYLE_CONTROL", SWIG_PyObj_FromInt((int)wxTOOL_STYLE_CONTROL)); + PyDict_SetItemString(d,"TB_HORIZONTAL", SWIG_PyObj_FromInt((int)wxTB_HORIZONTAL)); + PyDict_SetItemString(d,"TB_VERTICAL", SWIG_PyObj_FromInt((int)wxTB_VERTICAL)); + PyDict_SetItemString(d,"TB_3DBUTTONS", SWIG_PyObj_FromInt((int)wxTB_3DBUTTONS)); + PyDict_SetItemString(d,"TB_FLAT", SWIG_PyObj_FromInt((int)wxTB_FLAT)); + PyDict_SetItemString(d,"TB_DOCKABLE", SWIG_PyObj_FromInt((int)wxTB_DOCKABLE)); + PyDict_SetItemString(d,"TB_NOICONS", SWIG_PyObj_FromInt((int)wxTB_NOICONS)); + PyDict_SetItemString(d,"TB_TEXT", SWIG_PyObj_FromInt((int)wxTB_TEXT)); + PyDict_SetItemString(d,"TB_NODIVIDER", SWIG_PyObj_FromInt((int)wxTB_NODIVIDER)); + PyDict_SetItemString(d,"TB_NOALIGN", SWIG_PyObj_FromInt((int)wxTB_NOALIGN)); + PyDict_SetItemString(d,"TB_HORZ_LAYOUT", SWIG_PyObj_FromInt((int)wxTB_HORZ_LAYOUT)); + PyDict_SetItemString(d,"TB_HORZ_TEXT", SWIG_PyObj_FromInt((int)wxTB_HORZ_TEXT)); SWIG_addvarlink(SWIG_globals,(char*)"ListCtrlNameStr",_wrap_ListCtrlNameStr_get, _wrap_ListCtrlNameStr_set); + PyDict_SetItemString(d,"LC_VRULES", SWIG_PyObj_FromInt((int)wxLC_VRULES)); + PyDict_SetItemString(d,"LC_HRULES", SWIG_PyObj_FromInt((int)wxLC_HRULES)); + PyDict_SetItemString(d,"LC_ICON", SWIG_PyObj_FromInt((int)wxLC_ICON)); + PyDict_SetItemString(d,"LC_SMALL_ICON", SWIG_PyObj_FromInt((int)wxLC_SMALL_ICON)); + PyDict_SetItemString(d,"LC_LIST", SWIG_PyObj_FromInt((int)wxLC_LIST)); + PyDict_SetItemString(d,"LC_REPORT", SWIG_PyObj_FromInt((int)wxLC_REPORT)); + PyDict_SetItemString(d,"LC_ALIGN_TOP", SWIG_PyObj_FromInt((int)wxLC_ALIGN_TOP)); + PyDict_SetItemString(d,"LC_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxLC_ALIGN_LEFT)); + PyDict_SetItemString(d,"LC_AUTOARRANGE", SWIG_PyObj_FromInt((int)wxLC_AUTOARRANGE)); + PyDict_SetItemString(d,"LC_VIRTUAL", SWIG_PyObj_FromInt((int)wxLC_VIRTUAL)); + PyDict_SetItemString(d,"LC_EDIT_LABELS", SWIG_PyObj_FromInt((int)wxLC_EDIT_LABELS)); + PyDict_SetItemString(d,"LC_NO_HEADER", SWIG_PyObj_FromInt((int)wxLC_NO_HEADER)); + PyDict_SetItemString(d,"LC_NO_SORT_HEADER", SWIG_PyObj_FromInt((int)wxLC_NO_SORT_HEADER)); + PyDict_SetItemString(d,"LC_SINGLE_SEL", SWIG_PyObj_FromInt((int)wxLC_SINGLE_SEL)); + PyDict_SetItemString(d,"LC_SORT_ASCENDING", SWIG_PyObj_FromInt((int)wxLC_SORT_ASCENDING)); + PyDict_SetItemString(d,"LC_SORT_DESCENDING", SWIG_PyObj_FromInt((int)wxLC_SORT_DESCENDING)); + PyDict_SetItemString(d,"LC_MASK_TYPE", SWIG_PyObj_FromInt((int)wxLC_MASK_TYPE)); + PyDict_SetItemString(d,"LC_MASK_ALIGN", SWIG_PyObj_FromInt((int)wxLC_MASK_ALIGN)); + PyDict_SetItemString(d,"LC_MASK_SORT", SWIG_PyObj_FromInt((int)wxLC_MASK_SORT)); + PyDict_SetItemString(d,"LIST_MASK_STATE", SWIG_PyObj_FromInt((int)wxLIST_MASK_STATE)); + PyDict_SetItemString(d,"LIST_MASK_TEXT", SWIG_PyObj_FromInt((int)wxLIST_MASK_TEXT)); + PyDict_SetItemString(d,"LIST_MASK_IMAGE", SWIG_PyObj_FromInt((int)wxLIST_MASK_IMAGE)); + PyDict_SetItemString(d,"LIST_MASK_DATA", SWIG_PyObj_FromInt((int)wxLIST_MASK_DATA)); + PyDict_SetItemString(d,"LIST_SET_ITEM", SWIG_PyObj_FromInt((int)wxLIST_SET_ITEM)); + PyDict_SetItemString(d,"LIST_MASK_WIDTH", SWIG_PyObj_FromInt((int)wxLIST_MASK_WIDTH)); + PyDict_SetItemString(d,"LIST_MASK_FORMAT", SWIG_PyObj_FromInt((int)wxLIST_MASK_FORMAT)); + PyDict_SetItemString(d,"LIST_STATE_DONTCARE", SWIG_PyObj_FromInt((int)wxLIST_STATE_DONTCARE)); + PyDict_SetItemString(d,"LIST_STATE_DROPHILITED", SWIG_PyObj_FromInt((int)wxLIST_STATE_DROPHILITED)); + PyDict_SetItemString(d,"LIST_STATE_FOCUSED", SWIG_PyObj_FromInt((int)wxLIST_STATE_FOCUSED)); + PyDict_SetItemString(d,"LIST_STATE_SELECTED", SWIG_PyObj_FromInt((int)wxLIST_STATE_SELECTED)); + PyDict_SetItemString(d,"LIST_STATE_CUT", SWIG_PyObj_FromInt((int)wxLIST_STATE_CUT)); + PyDict_SetItemString(d,"LIST_STATE_DISABLED", SWIG_PyObj_FromInt((int)wxLIST_STATE_DISABLED)); + PyDict_SetItemString(d,"LIST_STATE_FILTERED", SWIG_PyObj_FromInt((int)wxLIST_STATE_FILTERED)); + PyDict_SetItemString(d,"LIST_STATE_INUSE", SWIG_PyObj_FromInt((int)wxLIST_STATE_INUSE)); + PyDict_SetItemString(d,"LIST_STATE_PICKED", SWIG_PyObj_FromInt((int)wxLIST_STATE_PICKED)); + PyDict_SetItemString(d,"LIST_STATE_SOURCE", SWIG_PyObj_FromInt((int)wxLIST_STATE_SOURCE)); + PyDict_SetItemString(d,"LIST_HITTEST_ABOVE", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ABOVE)); + PyDict_SetItemString(d,"LIST_HITTEST_BELOW", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_BELOW)); + PyDict_SetItemString(d,"LIST_HITTEST_NOWHERE", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEMICON", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEMICON)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEMLABEL", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEMLABEL)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEMRIGHT", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEMRIGHT)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEMSTATEICON", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEMSTATEICON)); + PyDict_SetItemString(d,"LIST_HITTEST_TOLEFT", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_TOLEFT)); + PyDict_SetItemString(d,"LIST_HITTEST_TORIGHT", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_TORIGHT)); + PyDict_SetItemString(d,"LIST_HITTEST_ONITEM", SWIG_PyObj_FromInt((int)wxLIST_HITTEST_ONITEM)); + PyDict_SetItemString(d,"LIST_NEXT_ABOVE", SWIG_PyObj_FromInt((int)wxLIST_NEXT_ABOVE)); + PyDict_SetItemString(d,"LIST_NEXT_ALL", SWIG_PyObj_FromInt((int)wxLIST_NEXT_ALL)); + PyDict_SetItemString(d,"LIST_NEXT_BELOW", SWIG_PyObj_FromInt((int)wxLIST_NEXT_BELOW)); + PyDict_SetItemString(d,"LIST_NEXT_LEFT", SWIG_PyObj_FromInt((int)wxLIST_NEXT_LEFT)); + PyDict_SetItemString(d,"LIST_NEXT_RIGHT", SWIG_PyObj_FromInt((int)wxLIST_NEXT_RIGHT)); + PyDict_SetItemString(d,"LIST_ALIGN_DEFAULT", SWIG_PyObj_FromInt((int)wxLIST_ALIGN_DEFAULT)); + PyDict_SetItemString(d,"LIST_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxLIST_ALIGN_LEFT)); + PyDict_SetItemString(d,"LIST_ALIGN_TOP", SWIG_PyObj_FromInt((int)wxLIST_ALIGN_TOP)); + PyDict_SetItemString(d,"LIST_ALIGN_SNAP_TO_GRID", SWIG_PyObj_FromInt((int)wxLIST_ALIGN_SNAP_TO_GRID)); + PyDict_SetItemString(d,"LIST_FORMAT_LEFT", SWIG_PyObj_FromInt((int)wxLIST_FORMAT_LEFT)); + PyDict_SetItemString(d,"LIST_FORMAT_RIGHT", SWIG_PyObj_FromInt((int)wxLIST_FORMAT_RIGHT)); + PyDict_SetItemString(d,"LIST_FORMAT_CENTRE", SWIG_PyObj_FromInt((int)wxLIST_FORMAT_CENTRE)); + PyDict_SetItemString(d,"LIST_FORMAT_CENTER", SWIG_PyObj_FromInt((int)wxLIST_FORMAT_CENTER)); + PyDict_SetItemString(d,"LIST_AUTOSIZE", SWIG_PyObj_FromInt((int)wxLIST_AUTOSIZE)); + PyDict_SetItemString(d,"LIST_AUTOSIZE_USEHEADER", SWIG_PyObj_FromInt((int)wxLIST_AUTOSIZE_USEHEADER)); + PyDict_SetItemString(d,"LIST_RECT_BOUNDS", SWIG_PyObj_FromInt((int)wxLIST_RECT_BOUNDS)); + PyDict_SetItemString(d,"LIST_RECT_ICON", SWIG_PyObj_FromInt((int)wxLIST_RECT_ICON)); + PyDict_SetItemString(d,"LIST_RECT_LABEL", SWIG_PyObj_FromInt((int)wxLIST_RECT_LABEL)); + PyDict_SetItemString(d,"LIST_FIND_UP", SWIG_PyObj_FromInt((int)wxLIST_FIND_UP)); + PyDict_SetItemString(d,"LIST_FIND_DOWN", SWIG_PyObj_FromInt((int)wxLIST_FIND_DOWN)); + PyDict_SetItemString(d,"LIST_FIND_LEFT", SWIG_PyObj_FromInt((int)wxLIST_FIND_LEFT)); + PyDict_SetItemString(d,"LIST_FIND_RIGHT", SWIG_PyObj_FromInt((int)wxLIST_FIND_RIGHT)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_RDRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_RDRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)); @@ -29213,6 +31435,41 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl"); SWIG_addvarlink(SWIG_globals,(char*)"TreeCtrlNameStr",_wrap_TreeCtrlNameStr_get, _wrap_TreeCtrlNameStr_set); + PyDict_SetItemString(d,"TR_NO_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_NO_BUTTONS)); + PyDict_SetItemString(d,"TR_HAS_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_HAS_BUTTONS)); + PyDict_SetItemString(d,"TR_NO_LINES", SWIG_PyObj_FromInt((int)wxTR_NO_LINES)); + PyDict_SetItemString(d,"TR_LINES_AT_ROOT", SWIG_PyObj_FromInt((int)wxTR_LINES_AT_ROOT)); + PyDict_SetItemString(d,"TR_SINGLE", SWIG_PyObj_FromInt((int)wxTR_SINGLE)); + PyDict_SetItemString(d,"TR_MULTIPLE", SWIG_PyObj_FromInt((int)wxTR_MULTIPLE)); + PyDict_SetItemString(d,"TR_EXTENDED", SWIG_PyObj_FromInt((int)wxTR_EXTENDED)); + PyDict_SetItemString(d,"TR_HAS_VARIABLE_ROW_HEIGHT", SWIG_PyObj_FromInt((int)wxTR_HAS_VARIABLE_ROW_HEIGHT)); + PyDict_SetItemString(d,"TR_EDIT_LABELS", SWIG_PyObj_FromInt((int)wxTR_EDIT_LABELS)); + PyDict_SetItemString(d,"TR_HIDE_ROOT", SWIG_PyObj_FromInt((int)wxTR_HIDE_ROOT)); + PyDict_SetItemString(d,"TR_ROW_LINES", SWIG_PyObj_FromInt((int)wxTR_ROW_LINES)); + PyDict_SetItemString(d,"TR_FULL_ROW_HIGHLIGHT", SWIG_PyObj_FromInt((int)wxTR_FULL_ROW_HIGHLIGHT)); + PyDict_SetItemString(d,"TR_DEFAULT_STYLE", SWIG_PyObj_FromInt((int)wxTR_DEFAULT_STYLE)); + PyDict_SetItemString(d,"TR_TWIST_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_TWIST_BUTTONS)); + PyDict_SetItemString(d,"TR_MAC_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_MAC_BUTTONS)); + PyDict_SetItemString(d,"TR_AQUA_BUTTONS", SWIG_PyObj_FromInt((int)wxTR_AQUA_BUTTONS)); + PyDict_SetItemString(d,"TreeItemIcon_Normal", SWIG_PyObj_FromInt((int)wxTreeItemIcon_Normal)); + PyDict_SetItemString(d,"TreeItemIcon_Selected", SWIG_PyObj_FromInt((int)wxTreeItemIcon_Selected)); + PyDict_SetItemString(d,"TreeItemIcon_Expanded", SWIG_PyObj_FromInt((int)wxTreeItemIcon_Expanded)); + PyDict_SetItemString(d,"TreeItemIcon_SelectedExpanded", SWIG_PyObj_FromInt((int)wxTreeItemIcon_SelectedExpanded)); + PyDict_SetItemString(d,"TreeItemIcon_Max", SWIG_PyObj_FromInt((int)wxTreeItemIcon_Max)); + PyDict_SetItemString(d,"TREE_HITTEST_ABOVE", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ABOVE)); + PyDict_SetItemString(d,"TREE_HITTEST_BELOW", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_BELOW)); + PyDict_SetItemString(d,"TREE_HITTEST_NOWHERE", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMBUTTON", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMBUTTON)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMICON", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMICON)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMINDENT", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMINDENT)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMLABEL", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMLABEL)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMRIGHT", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMRIGHT)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMSTATEICON", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMSTATEICON)); + PyDict_SetItemString(d,"TREE_HITTEST_TOLEFT", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_TOLEFT)); + PyDict_SetItemString(d,"TREE_HITTEST_TORIGHT", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_TORIGHT)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMUPPERPART", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMUPPERPART)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEMLOWERPART", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEMLOWERPART)); + PyDict_SetItemString(d,"TREE_HITTEST_ONITEM", SWIG_PyObj_FromInt((int)wxTREE_HITTEST_ONITEM)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_RDRAG", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_RDRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT)); @@ -29239,6 +31496,13 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl"); SWIG_addvarlink(SWIG_globals,(char*)"DirDialogDefaultFolderStr",_wrap_DirDialogDefaultFolderStr_get, _wrap_DirDialogDefaultFolderStr_set); + PyDict_SetItemString(d,"DIRCTRL_DIR_ONLY", SWIG_PyObj_FromInt((int)wxDIRCTRL_DIR_ONLY)); + PyDict_SetItemString(d,"DIRCTRL_SELECT_FIRST", SWIG_PyObj_FromInt((int)wxDIRCTRL_SELECT_FIRST)); + PyDict_SetItemString(d,"DIRCTRL_SHOW_FILTERS", SWIG_PyObj_FromInt((int)wxDIRCTRL_SHOW_FILTERS)); + PyDict_SetItemString(d,"DIRCTRL_3D_INTERNAL", SWIG_PyObj_FromInt((int)wxDIRCTRL_3D_INTERNAL)); + PyDict_SetItemString(d,"DIRCTRL_EDIT_LABELS", SWIG_PyObj_FromInt((int)wxDIRCTRL_EDIT_LABELS)); + PyDict_SetItemString(d,"FRAME_EX_CONTEXTHELP", SWIG_PyObj_FromInt((int)wxFRAME_EX_CONTEXTHELP)); + PyDict_SetItemString(d,"DIALOG_EX_CONTEXTHELP", SWIG_PyObj_FromInt((int)wxDIALOG_EX_CONTEXTHELP)); PyDict_SetItemString(d, "wxEVT_HELP", PyInt_FromLong(wxEVT_HELP)); PyDict_SetItemString(d, "wxEVT_DETAILED_HELP", PyInt_FromLong(wxEVT_DETAILED_HELP)); diff --git a/wxPython/src/msw/core_wrap.cpp b/wxPython/src/msw/core_wrap.cpp index 3dceb1598f..2893c41a41 100644 --- a/wxPython/src/msw/core_wrap.cpp +++ b/wxPython/src/msw/core_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -424,11 +273,11 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxArrayString swig_types[40] #define SWIGTYPE_p_wxShowEvent swig_types[41] #define SWIGTYPE_p_wxToolTip swig_types[42] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[43] -#define SWIGTYPE_p_wxIconizeEvent swig_types[44] -#define SWIGTYPE_p_wxActivateEvent swig_types[45] -#define SWIGTYPE_p_wxMoveEvent swig_types[46] -#define SWIGTYPE_p_wxSizeEvent swig_types[47] +#define SWIGTYPE_p_wxIconizeEvent swig_types[43] +#define SWIGTYPE_p_wxActivateEvent swig_types[44] +#define SWIGTYPE_p_wxMoveEvent swig_types[45] +#define SWIGTYPE_p_wxSizeEvent swig_types[46] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[47] #define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[48] #define SWIGTYPE_p_wxWindowCreateEvent swig_types[49] #define SWIGTYPE_p_wxIdleEvent swig_types[50] @@ -444,58 +293,59 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPNGHandler swig_types[60] #define SWIGTYPE_p_wxANIHandler swig_types[61] #define SWIGTYPE_p_wxMemoryFSHandler swig_types[62] -#define SWIGTYPE_p_wxEvtHandler swig_types[63] -#define SWIGTYPE_p_wxCURHandler swig_types[64] -#define SWIGTYPE_p_wxICOHandler swig_types[65] -#define SWIGTYPE_p_wxBMPHandler swig_types[66] -#define SWIGTYPE_p_wxImageHandler swig_types[67] -#define SWIGTYPE_p_wxFileSystemHandler swig_types[68] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[69] -#define SWIGTYPE_p_wxInternetFSHandler swig_types[70] -#define SWIGTYPE_p_wxZipFSHandler swig_types[71] +#define SWIGTYPE_p_wxZipFSHandler swig_types[63] +#define SWIGTYPE_p_wxEvtHandler swig_types[64] +#define SWIGTYPE_p_wxCURHandler swig_types[65] +#define SWIGTYPE_p_wxICOHandler swig_types[66] +#define SWIGTYPE_p_wxBMPHandler swig_types[67] +#define SWIGTYPE_p_wxImageHandler swig_types[68] +#define SWIGTYPE_p_wxFileSystemHandler swig_types[69] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[70] +#define SWIGTYPE_p_wxInternetFSHandler swig_types[71] #define SWIGTYPE_p_wxRect swig_types[72] #define SWIGTYPE_p_wxGBSpan swig_types[73] #define SWIGTYPE_p_wxPropagateOnce swig_types[74] #define SWIGTYPE_p_wxAcceleratorTable swig_types[75] -#define SWIGTYPE_p_wxGBPosition swig_types[76] -#define SWIGTYPE_p_wxImage swig_types[77] -#define SWIGTYPE_p_wxFrame swig_types[78] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[79] -#define SWIGTYPE_p_wxImageHistogram swig_types[80] -#define SWIGTYPE_p_byte swig_types[81] -#define SWIGTYPE_p_wxPoint swig_types[82] -#define SWIGTYPE_p_wxCursor swig_types[83] -#define SWIGTYPE_p_wxObject swig_types[84] -#define SWIGTYPE_p_wxPyInputStream swig_types[85] -#define SWIGTYPE_p_wxOutputStream swig_types[86] -#define SWIGTYPE_p_wxInputStream swig_types[87] -#define SWIGTYPE_p_wxDateTime swig_types[88] -#define SWIGTYPE_p_wxKeyEvent swig_types[89] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[90] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[91] -#define SWIGTYPE_p_wxWindow swig_types[92] -#define SWIGTYPE_p_wxMenuBar swig_types[93] -#define SWIGTYPE_p_wxString swig_types[94] -#define SWIGTYPE_p_wxFileSystem swig_types[95] -#define SWIGTYPE_p_wxBitmap swig_types[96] -#define SWIGTYPE_p_wxMenuEvent swig_types[97] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[98] -#define SWIGTYPE_p_unsigned_char swig_types[99] -#define SWIGTYPE_p_wxCloseEvent swig_types[100] -#define SWIGTYPE_p_wxEraseEvent swig_types[101] -#define SWIGTYPE_p_wxMouseEvent swig_types[102] -#define SWIGTYPE_p_wxPyApp swig_types[103] -#define SWIGTYPE_p_wxCommandEvent swig_types[104] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[105] -#define SWIGTYPE_p_wxPyDropTarget swig_types[106] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[107] -#define SWIGTYPE_p_wxFocusEvent swig_types[108] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[109] -#define SWIGTYPE_p_wxControlWithItems swig_types[110] -#define SWIGTYPE_p_wxColour swig_types[111] -#define SWIGTYPE_p_wxValidator swig_types[112] -#define SWIGTYPE_p_wxPyValidator swig_types[113] -static swig_type_info *swig_types[115]; +#define SWIGTYPE_p_char swig_types[76] +#define SWIGTYPE_p_wxGBPosition swig_types[77] +#define SWIGTYPE_p_wxImage swig_types[78] +#define SWIGTYPE_p_wxFrame swig_types[79] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[80] +#define SWIGTYPE_p_wxImageHistogram swig_types[81] +#define SWIGTYPE_p_byte swig_types[82] +#define SWIGTYPE_p_wxPoint swig_types[83] +#define SWIGTYPE_p_wxCursor swig_types[84] +#define SWIGTYPE_p_wxObject swig_types[85] +#define SWIGTYPE_p_wxPyInputStream swig_types[86] +#define SWIGTYPE_p_wxOutputStream swig_types[87] +#define SWIGTYPE_p_wxInputStream swig_types[88] +#define SWIGTYPE_p_wxDateTime swig_types[89] +#define SWIGTYPE_p_wxKeyEvent swig_types[90] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[91] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[92] +#define SWIGTYPE_p_wxWindow swig_types[93] +#define SWIGTYPE_p_wxMenuBar swig_types[94] +#define SWIGTYPE_p_wxString swig_types[95] +#define SWIGTYPE_p_wxFileSystem swig_types[96] +#define SWIGTYPE_p_wxBitmap swig_types[97] +#define SWIGTYPE_p_wxMenuEvent swig_types[98] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[99] +#define SWIGTYPE_p_unsigned_char swig_types[100] +#define SWIGTYPE_p_wxCloseEvent swig_types[101] +#define SWIGTYPE_p_wxEraseEvent swig_types[102] +#define SWIGTYPE_p_wxMouseEvent swig_types[103] +#define SWIGTYPE_p_wxPyApp swig_types[104] +#define SWIGTYPE_p_wxCommandEvent swig_types[105] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[106] +#define SWIGTYPE_p_wxPyDropTarget swig_types[107] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[108] +#define SWIGTYPE_p_wxFocusEvent swig_types[109] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[110] +#define SWIGTYPE_p_wxControlWithItems swig_types[111] +#define SWIGTYPE_p_wxColour swig_types[112] +#define SWIGTYPE_p_wxValidator swig_types[113] +#define SWIGTYPE_p_wxPyValidator swig_types[114] +static swig_type_info *swig_types[116]; /* -------- TYPES TABLE (END) -------- */ @@ -507,6 +357,44 @@ static swig_type_info *swig_types[115]; #define SWIG_name "_core" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython_int.h" #include "wx/wxPython/pyclasses.h" @@ -646,6 +534,17 @@ static wxPyCoreAPI API = { (p_SWIG_Python_InstallConstants_t)SWIG_Python_InstallConstants, (p_SWIG_Python_MustGetPtr_t)SWIG_Python_MustGetPtr, + (p_SWIG_PyObj_AsCharPtr_t)SWIG_PyObj_AsCharPtr, + (p_SWIG_PyObj_FromCharPtr_t)SWIG_PyObj_FromCharPtr, + (p_SWIG_PyObj_AsUnsignedLong_t)SWIG_PyObj_AsUnsignedLong, + (p_SWIG_PyObj_AsLongInRange_t)SWIG_PyObj_AsLongInRange, + (p_SWIG_PyObj_AsUnsignedLongInRange_t)SWIG_PyObj_AsUnsignedLongInRange, + (p_SWIG_PyObj_AsNewCharPtr_t)SWIG_PyObj_AsNewCharPtr, + (p_SWIG_PyObj_AsCharPtrAndSize_t)SWIG_PyObj_AsCharPtrAndSize, + (p_SWIG_PyObj_AsCharArray_t)SWIG_PyObj_AsCharArray, + (p_SWIG_PyObj_FromCharArray_t)SWIG_PyObj_FromCharArray, + (p_SWIG_PyObj_AsFloatConv_t)SWIG_PyObj_AsFloatConv, + wxPyCheckSwigType, wxPyConstructObject, wxPyConvertSwigPtr, @@ -733,6 +632,23 @@ void wxObject_Destroy(wxObject *self){ #define wxCURSOR_COPY_ARROW wxCURSOR_ARROW #endif + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + PyObject *wxSize_Get(wxSize *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); @@ -741,6 +657,22 @@ PyObject *wxSize_Get(wxSize *self){ wxPyEndBlockThreads(); return tup; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + void wxRealPoint_Set(wxRealPoint *self,double x,double y){ self->x = x; self->y = y; @@ -753,6 +685,13 @@ PyObject *wxRealPoint_Get(wxRealPoint *self){ wxPyEndBlockThreads(); return tup; } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + void wxPoint_Set(wxPoint *self,long x,long y){ self->x = x; self->y = y; @@ -851,6 +790,41 @@ wxPyInputStream *new_wxPyInputStream(PyObject *p){ else return NULL; } + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromChar(char c) +{ + return PyString_FromStringAndSize(&c,1); +} + + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + +SWIGSTATIC(char) +SWIG_PyObj_AsChar(PyObject *obj) +{ + char c = 0; + if (PyInt_Check(obj) || PyLong_Check(obj)) { + c = numeric_cast(char, + SWIG_PyObj_AsLongInRange(obj, "char",CHAR_MIN, CHAR_MAX)); + } else { + char* cptr; size_t csize; + SWIG_PyObj_AsCharPtrAndSize(obj, 0, &cptr, &csize); + if (csize == 1) { + c = cptr[0]; + } else { + PyErr_SetString(PyExc_TypeError, "a char is expected"); + } + } + return c; +} + void wxOutputStream_write(wxOutputStream *self,PyObject *obj){ // We use only strings for the streams, not unicode PyObject* str = PyObject_Str(obj); @@ -906,6 +880,13 @@ IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler, IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext); +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + wxString wxFileSystem_URLToFileName(const wxString& url) { wxFileName fname = wxFileSystem::URLToFileName(url); return fname.GetFullPath(); @@ -935,6 +916,14 @@ IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext #include "wx/wxPython/pyistream.h" + +SWIGSTATIC(unsigned char) +SWIG_PyObj_AsUnsignedChar(PyObject *obj) +{ + return numeric_cast(unsigned char, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned char", UCHAR_MAX)); +} + wxImage *new_wxImage(int width,int height,bool clear){ if (width > 0 && height > 0) return new wxImage(width, height, clear); @@ -1098,6 +1087,17 @@ int wxKeyEvent_GetUniChar(wxKeyEvent *self){ return 0; #endif } + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){ self->m_size = size; } @@ -1230,6 +1230,13 @@ void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObject *clientD } + +SWIGSTATIC(float) +SWIG_PyObj_AsFloat(PyObject *obj) +{ + return SWIG_PyObj_AsFloatConv(obj, SWIG_PyObj_AsDouble); +} + PyObject *wxSizerItem_GetUserData(wxSizerItem *self){ wxPyUserData* data = (wxPyUserData*)self->GetUserData(); if (data) { @@ -1480,7 +1487,7 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const & #ifdef __cplusplus extern "C" { #endif -static int _wrap_EmptyString_set(PyObject *_val) { +static int _wrap_EmptyString_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable EmptyString is read-only."); return 1; } @@ -1567,12 +1574,17 @@ static PyObject *_wrap_Size_width_set(PyObject *self, PyObject *args, PyObject * wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_width_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_width_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1595,7 +1607,7 @@ static PyObject *_wrap_Size_width_get(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1607,12 +1619,17 @@ static PyObject *_wrap_Size_height_set(PyObject *self, PyObject *args, PyObject wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_height_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_height_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -1635,7 +1652,7 @@ static PyObject *_wrap_Size_height_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1647,11 +1664,25 @@ static PyObject *_wrap_new_Size(PyObject *self, PyObject *args, PyObject *kwargs int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxSize *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Size",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Size",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSize *)new wxSize(arg1,arg2); @@ -1715,7 +1746,7 @@ static PyObject *_wrap_Size___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1747,7 +1778,7 @@ static PyObject *_wrap_Size___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1894,12 +1925,22 @@ static PyObject *_wrap_Size_Set(PyObject *self, PyObject *args, PyObject *kwargs int arg2 ; int 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 *)"Oii:Size_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Size_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set(arg2,arg3); @@ -1919,12 +1960,17 @@ static PyObject *_wrap_Size_SetWidth(PyObject *self, PyObject *args, PyObject *k wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -1944,12 +1990,17 @@ static PyObject *_wrap_Size_SetHeight(PyObject *self, PyObject *args, PyObject * wxSize *arg1 = (wxSize *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Size_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -1982,7 +2033,7 @@ static PyObject *_wrap_Size_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2007,7 +2058,7 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2051,12 +2102,17 @@ static PyObject *_wrap_RealPoint_x_set(PyObject *self, PyObject *args, PyObject wxRealPoint *arg1 = (wxRealPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:RealPoint_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2079,7 +2135,7 @@ static PyObject *_wrap_RealPoint_x_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (double) ((arg1)->x); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -2091,12 +2147,17 @@ static PyObject *_wrap_RealPoint_y_set(PyObject *self, PyObject *args, PyObject wxRealPoint *arg1 = (wxRealPoint *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:RealPoint_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2119,7 +2180,7 @@ static PyObject *_wrap_RealPoint_y_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (double) ((arg1)->y); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -2131,11 +2192,25 @@ static PyObject *_wrap_new_RealPoint(PyObject *self, PyObject *args, PyObject *k double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxRealPoint *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_RealPoint",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_RealPoint",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (double) SWIG_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRealPoint *)new wxRealPoint(arg1,arg2); @@ -2199,7 +2274,7 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2231,7 +2306,7 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2316,12 +2391,22 @@ static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *k 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:RealPoint_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RealPoint_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxRealPoint_Set(arg1,arg2,arg3); @@ -2373,12 +2458,17 @@ static PyObject *_wrap_Point_x_set(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg1 = (wxPoint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Point_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2401,7 +2491,7 @@ static PyObject *_wrap_Point_x_get(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2413,12 +2503,17 @@ static PyObject *_wrap_Point_y_set(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg1 = (wxPoint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Point_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -2441,7 +2536,7 @@ static PyObject *_wrap_Point_y_get(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2453,11 +2548,25 @@ static PyObject *_wrap_new_Point(PyObject *self, PyObject *args, PyObject *kwarg int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxPoint *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Point",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPoint *)new wxPoint(arg1,arg2); @@ -2521,7 +2630,7 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2553,7 +2662,7 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2708,12 +2817,22 @@ static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwarg long arg2 ; long 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 *)"Oll:Point_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Point_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPoint_Set(arg1,arg2,arg3); @@ -2767,11 +2886,39 @@ static PyObject *_wrap_new_Rect(PyObject *self, PyObject *args, PyObject *kwargs int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxRect *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_Rect",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Rect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRect *)new wxRect(arg1,arg2,arg3,arg4); @@ -2900,7 +3047,7 @@ static PyObject *_wrap_Rect_GetX(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2912,12 +3059,17 @@ static PyObject *_wrap_Rect_SetX(PyObject *self, PyObject *args, PyObject *kwarg wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetX(arg2); @@ -2950,7 +3102,7 @@ static PyObject *_wrap_Rect_GetY(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2962,12 +3114,17 @@ static PyObject *_wrap_Rect_SetY(PyObject *self, PyObject *args, PyObject *kwarg wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetY(arg2); @@ -3000,7 +3157,7 @@ static PyObject *_wrap_Rect_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3012,12 +3169,17 @@ static PyObject *_wrap_Rect_SetWidth(PyObject *self, PyObject *args, PyObject *k wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -3050,7 +3212,7 @@ static PyObject *_wrap_Rect_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3062,12 +3224,17 @@ static PyObject *_wrap_Rect_SetHeight(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -3340,7 +3507,7 @@ static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3365,7 +3532,7 @@ static PyObject *_wrap_Rect_GetTop(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3390,7 +3557,7 @@ static PyObject *_wrap_Rect_GetBottom(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3415,7 +3582,7 @@ static PyObject *_wrap_Rect_GetRight(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3427,12 +3594,17 @@ static PyObject *_wrap_Rect_SetLeft(PyObject *self, PyObject *args, PyObject *kw wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "left", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetLeft",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetLeft",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLeft(arg2); @@ -3452,12 +3624,17 @@ static PyObject *_wrap_Rect_SetRight(PyObject *self, PyObject *args, PyObject *k wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "right", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetRight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetRight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRight(arg2); @@ -3477,12 +3654,17 @@ static PyObject *_wrap_Rect_SetTop(PyObject *self, PyObject *args, PyObject *kwa wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "top", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetTop",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTop",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTop(arg2); @@ -3502,12 +3684,17 @@ static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bottom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_SetBottom",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBottom(arg2); @@ -3529,12 +3716,22 @@ static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kw int arg3 ; wxRect *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_Inflate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Inflate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -3559,12 +3756,22 @@ static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kw int arg3 ; wxRect *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_Deflate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Deflate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -3588,12 +3795,22 @@ static PyObject *_wrap_Rect_OffsetXY(PyObject *self, PyObject *args, PyObject *k int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Rect_OffsetXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_OffsetXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Offset(arg2,arg3); @@ -3770,7 +3987,7 @@ static PyObject *_wrap_Rect___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3802,7 +4019,7 @@ static PyObject *_wrap_Rect___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3816,12 +4033,22 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k int arg3 ; bool 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 *)"Oii:Rect_InsideXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_InsideXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxRect const *)arg1)->Inside(arg2,arg3); @@ -3829,7 +4056,7 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3861,7 +4088,7 @@ static PyObject *_wrap_Rect_Inside(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3893,7 +4120,7 @@ static PyObject *_wrap_Rect_Intersects(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3905,12 +4132,17 @@ static PyObject *_wrap_Rect_x_set(PyObject *self, PyObject *args, PyObject *kwar wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -3933,7 +4165,7 @@ static PyObject *_wrap_Rect_x_get(PyObject *self, PyObject *args, PyObject *kwar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3945,12 +4177,17 @@ static PyObject *_wrap_Rect_y_set(PyObject *self, PyObject *args, PyObject *kwar wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -3973,7 +4210,7 @@ static PyObject *_wrap_Rect_y_get(PyObject *self, PyObject *args, PyObject *kwar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3985,12 +4222,17 @@ static PyObject *_wrap_Rect_width_set(PyObject *self, PyObject *args, PyObject * wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_width_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_width_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->width = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4013,7 +4255,7 @@ static PyObject *_wrap_Rect_width_get(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->width); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4025,12 +4267,17 @@ static PyObject *_wrap_Rect_height_set(PyObject *self, PyObject *args, PyObject wxRect *arg1 = (wxRect *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Rect_height_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_height_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->height = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4053,7 +4300,7 @@ static PyObject *_wrap_Rect_height_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->height); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4068,12 +4315,40 @@ static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs int arg4 = (int) 0 ; int arg5 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiii:Rect_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:Rect_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxRect_Set(arg1,arg2,arg3,arg4,arg5); @@ -4153,11 +4428,25 @@ static PyObject *_wrap_new_Point2D(PyObject *self, PyObject *args, PyObject *kwa double arg1 = (double) 0.0 ; double arg2 = (double) 0.0 ; wxPoint2D *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|dd:new_Point2D",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point2D",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (double) SWIG_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPoint2D *)new wxPoint2D(arg1,arg2); @@ -4324,7 +4613,7 @@ static PyObject *_wrap_Point2D_GetVectorLength(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4349,7 +4638,7 @@ static PyObject *_wrap_Point2D_GetVectorAngle(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4361,12 +4650,17 @@ static PyObject *_wrap_Point2D_SetVectorLength(PyObject *self, PyObject *args, P wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "length", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_SetVectorLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVectorLength(arg2); @@ -4386,12 +4680,17 @@ static PyObject *_wrap_Point2D_SetVectorAngle(PyObject *self, PyObject *args, Py wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "degrees", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_SetVectorAngle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorAngle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVectorAngle(arg2); @@ -4431,7 +4730,7 @@ static PyObject *_wrap_Point2D_GetDistance(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4463,7 +4762,7 @@ static PyObject *_wrap_Point2D_GetDistanceSquare(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4495,7 +4794,7 @@ static PyObject *_wrap_Point2D_GetDotProduct(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4527,7 +4826,7 @@ static PyObject *_wrap_Point2D_GetCrossProduct(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4728,7 +5027,7 @@ static PyObject *_wrap_Point2D___eq__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4760,7 +5059,7 @@ static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4772,12 +5071,17 @@ static PyObject *_wrap_Point2D_x_set(PyObject *self, PyObject *args, PyObject *k wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4800,7 +5104,7 @@ static PyObject *_wrap_Point2D_x_get(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (double) ((arg1)->m_x); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4812,12 +5116,17 @@ static PyObject *_wrap_Point2D_y_set(PyObject *self, PyObject *args, PyObject *k wxPoint2D *arg1 = (wxPoint2D *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -4840,7 +5149,7 @@ static PyObject *_wrap_Point2D_y_get(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (double) ((arg1)->m_y); - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -4853,12 +5162,26 @@ static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwa double arg2 = (double) 0 ; double arg3 = (double) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|dd:Point2D_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Point2D_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPoint2D_Set(arg1,arg2,arg3); @@ -4905,7 +5228,7 @@ static PyObject * Point2D_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_DefaultPosition_set(PyObject *_val) { +static int _wrap_DefaultPosition_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DefaultPosition is read-only."); return 1; } @@ -4919,7 +5242,7 @@ static PyObject *_wrap_DefaultPosition_get() { } -static int _wrap_DefaultSize_set(PyObject *_val) { +static int _wrap_DefaultSize_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DefaultSize is read-only."); return 1; } @@ -5024,7 +5347,7 @@ static PyObject *_wrap_InputStream_eof(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5037,12 +5360,19 @@ static PyObject *_wrap_InputStream_read(PyObject *self, PyObject *args, PyObject int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "size", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_read",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_read",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->read(arg2); @@ -5063,12 +5393,19 @@ static PyObject *_wrap_InputStream_readline(PyObject *self, PyObject *args, PyOb int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "size", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_readline",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_readline",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->readline(arg2); @@ -5089,12 +5426,19 @@ static PyObject *_wrap_InputStream_readlines(PyObject *self, PyObject *args, PyO int arg2 = (int) -1 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sizehint", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:InputStream_readlines",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:InputStream_readlines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)(arg1)->readlines(arg2); @@ -5115,12 +5459,24 @@ static PyObject *_wrap_InputStream_seek(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "offset",(char *) "whence", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:InputStream_seek",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:InputStream_seek",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->seek(arg2,arg3); @@ -5153,7 +5509,7 @@ static PyObject *_wrap_InputStream_tell(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5178,7 +5534,7 @@ static PyObject *_wrap_InputStream_Peek(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromChar(result); + resultobj = SWIG_PyObj_FromChar((char)result); return resultobj; fail: return NULL; @@ -5203,7 +5559,7 @@ static PyObject *_wrap_InputStream_GetC(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromChar(result); + resultobj = SWIG_PyObj_FromChar((char)result); return resultobj; fail: return NULL; @@ -5228,7 +5584,7 @@ static PyObject *_wrap_InputStream_LastRead(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -5253,7 +5609,7 @@ static PyObject *_wrap_InputStream_CanRead(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5278,7 +5634,7 @@ static PyObject *_wrap_InputStream_Eof(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5291,12 +5647,17 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj char arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "c", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oc:InputStream_Ungetch",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:InputStream_Ungetch",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (char) SWIG_PyObj_AsChar(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Ungetch(arg2); @@ -5304,7 +5665,7 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5318,12 +5679,24 @@ static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObjec int arg3 = (int) wxFromStart ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|i:InputStream_SeekI",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:InputStream_SeekI",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyInputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxSeekMode) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->SeekI(arg2,(wxSeekMode )arg3); @@ -5331,7 +5704,7 @@ static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -5356,7 +5729,7 @@ static PyObject *_wrap_InputStream_TellI(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -5786,7 +6159,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5859,17 +6232,24 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FileSystemHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystemHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileSystemHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindFirst((wxString const &)*arg2,arg3); @@ -6241,7 +6621,7 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6350,17 +6730,24 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FileSystem_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileSystem_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileSystem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindFirst((wxString const &)*arg2,arg3); @@ -6608,7 +6995,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6727,7 +7114,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6800,17 +7187,24 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:ZipFSHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ZipFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxZipFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindFirst((wxString const &)*arg2,arg3); @@ -6885,11 +7279,12 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "image",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:__wxMemoryFSHandler_AddFile_wxImage",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:__wxMemoryFSHandler_AddFile_wxImage",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -6899,6 +7294,10 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); __wxMemoryFSHandler_AddFile_wxImage((wxString const &)*arg1,*arg2,arg3); @@ -6929,11 +7328,12 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "bitmap",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:__wxMemoryFSHandler_AddFile_wxBitmap",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:__wxMemoryFSHandler_AddFile_wxBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -6943,6 +7343,10 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); __wxMemoryFSHandler_AddFile_wxBitmap((wxString const &)*arg1,(wxBitmap const &)*arg2,arg3); @@ -7090,7 +7494,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7163,17 +7567,24 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args, bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "spec",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:MemoryFSHandler_FindFirst",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MemoryFSHandler_FindFirst",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMemoryFSHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindFirst((wxString const &)*arg2,arg3); @@ -7320,7 +7731,7 @@ static PyObject *_wrap_ImageHandler_GetType(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -7384,7 +7795,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -7484,12 +7895,17 @@ static PyObject *_wrap_ImageHandler_SetType(PyObject *self, PyObject *args, PyOb wxImageHandler *arg1 = (wxImageHandler *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ImageHandler_SetType",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetType",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetType(arg2); @@ -7588,15 +8004,15 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageHistogram_MakeKey",kwnames,&obj0,&obj1,&obj2)) goto fail; { - arg1 = (unsigned char) SPyObj_AsUnsignedChar(obj0); + arg1 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj0); if (PyErr_Occurred()) SWIG_fail; } { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -7606,7 +8022,7 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -7641,19 +8057,19 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageHistogram,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg5 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg5 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg6 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg6 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { - arg7 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg7 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7664,7 +8080,7 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -7698,16 +8114,30 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg wxImage *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|li:new_Image",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_Image",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage((wxString const &)*arg1,arg2,arg3); @@ -7764,11 +8194,12 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "name",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:new_ImageFromMime",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_ImageFromMime",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -7779,6 +8210,12 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage((wxString const &)*arg1,(wxString const &)*arg2,arg3); @@ -7818,11 +8255,13 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj wxPyInputStream *temp1 ; bool created1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "stream",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|li:new_ImageFromStream",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_ImageFromStream",kwnames,&obj0,&obj1,&obj2)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; @@ -7837,6 +8276,18 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj created1 = True; } } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage(*arg1,arg2,arg3); @@ -7870,11 +8321,12 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "stream",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:new_ImageFromStreamMime",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_ImageFromStreamMime",kwnames,&obj0,&obj1,&obj2)) goto fail; { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; @@ -7894,6 +8346,12 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImage *)new wxImage(*arg1,(wxString const &)*arg2,arg3); @@ -7930,15 +8388,29 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject * int arg2 = (int) 0 ; bool arg3 = (bool) True ; wxImage *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "clear", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_EmptyImage",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_EmptyImage",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7990,12 +8462,22 @@ static PyObject *_wrap_new_ImageFromData(PyObject *self, PyObject *args, PyObjec int arg2 ; unsigned char *arg3 = (unsigned char *) 0 ; wxImage *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiO:new_ImageFromData",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_ImageFromData",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8017,12 +8499,22 @@ static PyObject *_wrap_Image_Create(PyObject *self, PyObject *args, PyObject *kw int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Create",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Create(arg2,arg3); @@ -8068,12 +8560,22 @@ static PyObject *_wrap_Image_Scale(PyObject *self, PyObject *args, PyObject *kwa int arg3 ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Scale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->Scale(arg2,arg3); @@ -8099,12 +8601,22 @@ static PyObject *_wrap_Image_ShrinkBy(PyObject *self, PyObject *args, PyObject * int arg3 ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xFactor",(char *) "yFactor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_ShrinkBy",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_ShrinkBy",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxImage const *)arg1)->ShrinkBy(arg2,arg3); @@ -8130,12 +8642,22 @@ static PyObject *_wrap_Image_Rescale(PyObject *self, PyObject *args, PyObject *k int arg3 ; wxImage *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Image_Rescale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Rescale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -8162,6 +8684,8 @@ static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kw unsigned char arg5 ; unsigned char arg6 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; @@ -8169,18 +8693,26 @@ static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "x",(char *) "y",(char *) "r",(char *) "g",(char *) "b", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiOOO:Image_SetRGB",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Image_SetRGB",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { - arg5 = (unsigned char) SPyObj_AsUnsignedChar(obj4); + arg5 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj4); if (PyErr_Occurred()) SWIG_fail; } { - arg6 = (unsigned char) SPyObj_AsUnsignedChar(obj5); + arg6 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj5); if (PyErr_Occurred()) SWIG_fail; } { @@ -8204,12 +8736,22 @@ static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kw int arg3 ; unsigned char 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 *)"Oii:Image_GetRed",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetRed",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetRed(arg2,arg3); @@ -8217,7 +8759,7 @@ static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8231,12 +8773,22 @@ static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char 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 *)"Oii:Image_GetGreen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetGreen",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetGreen(arg2,arg3); @@ -8244,7 +8796,7 @@ static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8258,12 +8810,22 @@ static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *k int arg3 ; unsigned char 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 *)"Oii:Image_GetBlue",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetBlue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetBlue(arg2,arg3); @@ -8271,7 +8833,7 @@ static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8285,15 +8847,25 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "alpha", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Image_SetAlpha",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -8317,12 +8889,22 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject * int arg3 ; unsigned char 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 *)"Oii:Image_GetAlpha",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetAlpha",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (unsigned char)(arg1)->GetAlpha(arg2,arg3); @@ -8330,7 +8912,7 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -8355,7 +8937,7 @@ static PyObject *_wrap_Image_HasAlpha(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8390,19 +8972,19 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg5 = (byte) SPyObj_AsUnsignedChar(obj1); + arg5 = (byte) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg6 = (byte) SPyObj_AsUnsignedChar(obj2); + arg6 = (byte) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { - arg7 = (byte) SPyObj_AsUnsignedChar(obj3); + arg7 = (byte) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -8413,7 +8995,7 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -8456,15 +9038,15 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg3 = (byte) SPyObj_AsUnsignedChar(obj2); + arg3 = (byte) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (byte) SPyObj_AsUnsignedChar(obj3); + arg4 = (byte) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { - arg5 = (byte) SPyObj_AsUnsignedChar(obj4); + arg5 = (byte) SWIG_PyObj_AsUnsignedChar(obj4); if (PyErr_Occurred()) SWIG_fail; } { @@ -8474,7 +9056,7 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8504,7 +9086,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -8526,16 +9108,23 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj int result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Image_GetImageCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_GetImageCount",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxImage::GetImageCount((wxString const &)*arg1,arg2); @@ -8543,7 +9132,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp1) delete arg1; @@ -8568,17 +9157,31 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|li:Image_LoadFile",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Image_LoadFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3,arg4); @@ -8586,7 +9189,7 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8613,11 +9216,12 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Image_LoadMimeFile",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_LoadMimeFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -8629,6 +9233,12 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxString const &)*arg3,arg4); @@ -8636,7 +9246,7 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8668,17 +9278,22 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Image_SaveFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SaveFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SaveFile((wxString const &)*arg2,arg3); @@ -8686,7 +9301,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8735,7 +9350,7 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8791,7 +9406,7 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (created1) delete arg1; @@ -8817,11 +9432,13 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject bool created2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stream",(char *) "type",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|li:Image_LoadStream",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Image_LoadStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { @@ -8837,6 +9454,18 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject created2 = True; } } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile(*arg2,arg3,arg4); @@ -8844,7 +9473,7 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (created2) delete arg2; @@ -8872,11 +9501,12 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stream",(char *) "mimetype",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Image_LoadMimeStream",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_LoadMimeStream",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { @@ -8897,6 +9527,12 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile(*arg2,(wxString const &)*arg3,arg4); @@ -8904,7 +9540,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (created2) delete arg2; @@ -8945,7 +9581,7 @@ static PyObject *_wrap_Image_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8970,7 +9606,7 @@ static PyObject *_wrap_Image_GetWidth(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8995,7 +9631,7 @@ static PyObject *_wrap_Image_GetHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9075,16 +9711,26 @@ static PyObject *_wrap_Image_Paste(PyObject *self, PyObject *args, PyObject *kwa int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "image",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:Image_Paste",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_Paste",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Paste((wxImage const &)*arg2,arg3,arg4); @@ -9324,15 +9970,15 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetMaskColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -9367,7 +10013,7 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9392,7 +10038,7 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9417,7 +10063,7 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -9438,7 +10084,7 @@ static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9474,7 +10120,7 @@ static PyObject *_wrap_Image_HasMask(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9491,6 +10137,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw SwigValueWrapper< wxImage > result; wxPoint temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -9498,15 +10145,19 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw (char *) "self",(char *) "angle",(char *) "centre_of_rotation",(char *) "interpolating",(char *) "offset_after_rotation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OdO|OO:Image_Rotate",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Image_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -9546,7 +10197,7 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9583,7 +10234,7 @@ static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kw if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9628,27 +10279,27 @@ static PyObject *_wrap_Image_Replace(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:Image_Replace",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { - arg5 = (unsigned char) SPyObj_AsUnsignedChar(obj4); + arg5 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj4); if (PyErr_Occurred()) SWIG_fail; } { - arg6 = (unsigned char) SPyObj_AsUnsignedChar(obj5); + arg6 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj5); if (PyErr_Occurred()) SWIG_fail; } { - arg7 = (unsigned char) SPyObj_AsUnsignedChar(obj6); + arg7 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj6); if (PyErr_Occurred()) SWIG_fail; } { @@ -9683,15 +10334,15 @@ static PyObject *_wrap_Image_ConvertToMono(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMono",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -9776,17 +10427,22 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Image_SetOptionInt",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_SetOptionInt",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOption((wxString const &)*arg2,arg3); @@ -9882,7 +10538,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -9923,7 +10579,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9953,7 +10609,7 @@ static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (unsigned long) SPyObj_AsUnsignedLong(obj1); + arg2 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9964,7 +10620,7 @@ static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -9995,7 +10651,7 @@ static PyObject *_wrap_Image_ComputeHistogram(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -10073,7 +10729,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -10163,15 +10819,15 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMonoBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -10220,7 +10876,7 @@ static PyObject *_wrap_InitAllImageHandlers(PyObject *self, PyObject *args, PyOb } -static int _wrap_NullImage_set(PyObject *_val) { +static int _wrap_NullImage_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullImage is read-only."); return 1; } @@ -10234,7 +10890,7 @@ static PyObject *_wrap_NullImage_get() { } -static int _wrap_IMAGE_OPTION_BMP_FORMAT_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_BMP_FORMAT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_BMP_FORMAT is read-only."); return 1; } @@ -10254,7 +10910,7 @@ static PyObject *_wrap_IMAGE_OPTION_BMP_FORMAT_get() { } -static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_X_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_X_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_CUR_HOTSPOT_X is read-only."); return 1; } @@ -10274,7 +10930,7 @@ static PyObject *_wrap_IMAGE_OPTION_CUR_HOTSPOT_X_get() { } -static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_CUR_HOTSPOT_Y is read-only."); return 1; } @@ -10294,7 +10950,7 @@ static PyObject *_wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_get() { } -static int _wrap_IMAGE_OPTION_RESOLUTION_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_RESOLUTION_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTION is read-only."); return 1; } @@ -10314,7 +10970,7 @@ static PyObject *_wrap_IMAGE_OPTION_RESOLUTION_get() { } -static int _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set(PyObject *_val) { +static int _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTIONUNIT is read-only."); return 1; } @@ -10803,7 +11459,7 @@ static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10823,7 +11479,7 @@ static PyObject *_wrap_EvtHandler_SetEvtHandlerEnabled(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetEvtHandlerEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -10864,7 +11520,7 @@ static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10933,13 +11589,28 @@ static PyObject *_wrap_EvtHandler_Connect(PyObject *self, PyObject *args, PyObje int arg4 ; PyObject *arg5 = (PyObject *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "lastId",(char *) "eventType",(char *) "func", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:EvtHandler_Connect",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:EvtHandler_Connect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } arg5 = obj4; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10963,12 +11634,31 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO wxEventType arg4 = (wxEventType) wxEVT_NULL ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "lastId",(char *) "eventType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:EvtHandler_Disconnect",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:EvtHandler_Disconnect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxEventType) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxEvtHandler_Disconnect(arg1,arg2,arg3,arg4); @@ -10976,7 +11666,7 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11032,7 +11722,7 @@ static PyObject *_wrap_NewEventType(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11068,12 +11758,17 @@ static PyObject *_wrap_Event_SetEventType(PyObject *self, PyObject *args, PyObje wxEvent *arg1 = (wxEvent *) 0 ; wxEventType arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "typ", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_SetEventType",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetEventType",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEventType(arg2); @@ -11106,7 +11801,7 @@ static PyObject *_wrap_Event_GetEventType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11185,7 +11880,7 @@ static PyObject *_wrap_Event_GetTimestamp(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -11197,12 +11892,19 @@ static PyObject *_wrap_Event_SetTimestamp(PyObject *self, PyObject *args, PyObje wxEvent *arg1 = (wxEvent *) 0 ; long arg2 = (long) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ts", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Event_SetTimestamp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Event_SetTimestamp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetTimestamp(arg2); @@ -11235,7 +11937,7 @@ static PyObject *_wrap_Event_GetId(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11247,12 +11949,17 @@ static PyObject *_wrap_Event_SetId(PyObject *self, PyObject *args, PyObject *kwa wxEvent *arg1 = (wxEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -11285,7 +11992,7 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11306,7 +12013,7 @@ static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -11342,7 +12049,7 @@ static PyObject *_wrap_Event_GetSkipped(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11367,7 +12074,7 @@ static PyObject *_wrap_Event_ShouldPropagate(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11392,7 +12099,7 @@ static PyObject *_wrap_Event_StopPropagation(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11404,12 +12111,17 @@ static PyObject *_wrap_Event_ResumePropagation(PyObject *self, PyObject *args, P wxEvent *arg1 = (wxEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "propagationLevel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Event_ResumePropagation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_ResumePropagation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ResumePropagation(arg2); @@ -11579,11 +12291,25 @@ static PyObject *_wrap_new_CommandEvent(PyObject *self, PyObject *args, PyObject wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxCommandEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_CommandEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CommandEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCommandEvent *)new wxCommandEvent(arg1,arg2); @@ -11616,7 +12342,7 @@ static PyObject *_wrap_CommandEvent_GetSelection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11712,7 +12438,7 @@ static PyObject *_wrap_CommandEvent_IsChecked(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11737,7 +12463,7 @@ static PyObject *_wrap_CommandEvent_IsSelection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11749,12 +12475,17 @@ static PyObject *_wrap_CommandEvent_SetExtraLong(PyObject *self, PyObject *args, wxCommandEvent *arg1 = (wxCommandEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "extraLong", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:CommandEvent_SetExtraLong",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetExtraLong",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraLong(arg2); @@ -11787,7 +12518,7 @@ static PyObject *_wrap_CommandEvent_GetExtraLong(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -11799,12 +12530,17 @@ static PyObject *_wrap_CommandEvent_SetInt(PyObject *self, PyObject *args, PyObj wxCommandEvent *arg1 = (wxCommandEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CommandEvent_SetInt",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetInt",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCommandEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInt(arg2); @@ -11837,7 +12573,7 @@ static PyObject *_wrap_CommandEvent_GetInt(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -11881,11 +12617,25 @@ static PyObject *_wrap_new_NotifyEvent(PyObject *self, PyObject *args, PyObject wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxNotifyEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_NotifyEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_NotifyEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNotifyEvent *)new wxNotifyEvent(arg1,arg2); @@ -11966,7 +12716,7 @@ static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11987,11 +12737,39 @@ static PyObject *_wrap_new_ScrollEvent(PyObject *self, PyObject *args, PyObject int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxScrollEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "winid",(char *) "pos",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_ScrollEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ScrollEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxScrollEvent *)new wxScrollEvent(arg1,arg2,arg3,arg4); @@ -12024,7 +12802,7 @@ static PyObject *_wrap_ScrollEvent_GetOrientation(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12049,7 +12827,7 @@ static PyObject *_wrap_ScrollEvent_GetPosition(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12061,12 +12839,17 @@ static PyObject *_wrap_ScrollEvent_SetOrientation(PyObject *self, PyObject *args wxScrollEvent *arg1 = (wxScrollEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -12086,12 +12869,17 @@ static PyObject *_wrap_ScrollEvent_SetPosition(PyObject *self, PyObject *args, P wxScrollEvent *arg1 = (wxScrollEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -12119,11 +12907,32 @@ static PyObject *_wrap_new_ScrollWinEvent(PyObject *self, PyObject *args, PyObje int arg2 = (int) 0 ; int arg3 = (int) 0 ; wxScrollWinEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "pos",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iii:new_ScrollWinEvent",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ScrollWinEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxScrollWinEvent *)new wxScrollWinEvent(arg1,arg2,arg3); @@ -12156,7 +12965,7 @@ static PyObject *_wrap_ScrollWinEvent_GetOrientation(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12181,7 +12990,7 @@ static PyObject *_wrap_ScrollWinEvent_GetPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12193,12 +13002,17 @@ static PyObject *_wrap_ScrollWinEvent_SetOrientation(PyObject *self, PyObject *a wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollWinEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollWinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -12218,12 +13032,17 @@ static PyObject *_wrap_ScrollWinEvent_SetPosition(PyObject *self, PyObject *args wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrollWinEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrollWinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPosition(arg2); @@ -12249,11 +13068,18 @@ static PyObject *_wrap_new_MouseEvent(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxMouseEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mouseType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_MouseEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MouseEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMouseEvent *)new wxMouseEvent(arg1); @@ -12288,7 +13114,7 @@ static PyObject *_wrap_MouseEvent_IsButton(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12301,12 +13127,19 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonDown",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonDown(arg2); @@ -12314,7 +13147,7 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12327,12 +13160,19 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonDClick",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonDClick",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonDClick(arg2); @@ -12340,7 +13180,7 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12353,12 +13193,19 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj int arg2 = (int) wxMOUSE_BTN_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:MouseEvent_ButtonUp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:MouseEvent_ButtonUp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonUp(arg2); @@ -12366,7 +13213,7 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12379,12 +13226,17 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_Button",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_Button",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->Button(arg2); @@ -12392,7 +13244,7 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12405,12 +13257,17 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_ButtonIsDown",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_ButtonIsDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMouseEvent const *)arg1)->ButtonIsDown(arg2); @@ -12418,7 +13275,7 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12443,7 +13300,7 @@ static PyObject *_wrap_MouseEvent_GetButton(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12468,7 +13325,7 @@ static PyObject *_wrap_MouseEvent_ControlDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12493,7 +13350,7 @@ static PyObject *_wrap_MouseEvent_MetaDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12518,7 +13375,7 @@ static PyObject *_wrap_MouseEvent_AltDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12543,7 +13400,7 @@ static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12568,7 +13425,7 @@ static PyObject *_wrap_MouseEvent_LeftDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12593,7 +13450,7 @@ static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12618,7 +13475,7 @@ static PyObject *_wrap_MouseEvent_RightDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12643,7 +13500,7 @@ static PyObject *_wrap_MouseEvent_LeftUp(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12668,7 +13525,7 @@ static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12693,7 +13550,7 @@ static PyObject *_wrap_MouseEvent_RightUp(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12718,7 +13575,7 @@ static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12743,7 +13600,7 @@ static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12768,7 +13625,7 @@ static PyObject *_wrap_MouseEvent_RightDClick(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12793,7 +13650,7 @@ static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12818,7 +13675,7 @@ static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12843,7 +13700,7 @@ static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12868,7 +13725,7 @@ static PyObject *_wrap_MouseEvent_Dragging(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12893,7 +13750,7 @@ static PyObject *_wrap_MouseEvent_Moving(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12918,7 +13775,7 @@ static PyObject *_wrap_MouseEvent_Entering(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12943,7 +13800,7 @@ static PyObject *_wrap_MouseEvent_Leaving(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13070,7 +13927,7 @@ static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13095,7 +13952,7 @@ static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13120,7 +13977,7 @@ static PyObject *_wrap_MouseEvent_GetWheelRotation(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13145,7 +14002,7 @@ static PyObject *_wrap_MouseEvent_GetWheelDelta(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13170,7 +14027,7 @@ static PyObject *_wrap_MouseEvent_GetLinesPerAction(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13195,7 +14052,7 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13207,12 +14064,17 @@ static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObje wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13235,7 +14097,7 @@ static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13247,12 +14109,17 @@ static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObje wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13275,7 +14142,7 @@ static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13295,7 +14162,7 @@ static PyObject *_wrap_MouseEvent_m_leftDown_set(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_leftDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_leftDown = arg2; @@ -13320,7 +14187,7 @@ static PyObject *_wrap_MouseEvent_m_leftDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_leftDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13340,7 +14207,7 @@ static PyObject *_wrap_MouseEvent_m_middleDown_set(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_middleDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_middleDown = arg2; @@ -13365,7 +14232,7 @@ static PyObject *_wrap_MouseEvent_m_middleDown_get(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_middleDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13385,7 +14252,7 @@ static PyObject *_wrap_MouseEvent_m_rightDown_set(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_rightDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_rightDown = arg2; @@ -13410,7 +14277,7 @@ static PyObject *_wrap_MouseEvent_m_rightDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_rightDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13430,7 +14297,7 @@ static PyObject *_wrap_MouseEvent_m_controlDown_set(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_controlDown = arg2; @@ -13455,7 +14322,7 @@ static PyObject *_wrap_MouseEvent_m_controlDown_get(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_controlDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13475,7 +14342,7 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_set(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_shiftDown = arg2; @@ -13500,7 +14367,7 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_shiftDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13520,7 +14387,7 @@ static PyObject *_wrap_MouseEvent_m_altDown_set(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_altDown = arg2; @@ -13545,7 +14412,7 @@ static PyObject *_wrap_MouseEvent_m_altDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_altDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13565,7 +14432,7 @@ static PyObject *_wrap_MouseEvent_m_metaDown_set(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_metaDown = arg2; @@ -13590,7 +14457,7 @@ static PyObject *_wrap_MouseEvent_m_metaDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_metaDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13602,12 +14469,17 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_set(PyObject *self, PyObject * wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_wheelRotation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_wheelRotation_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelRotation_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_wheelRotation = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13630,7 +14502,7 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_get(PyObject *self, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_wheelRotation); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13642,12 +14514,17 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_set(PyObject *self, PyObject *arg wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_wheelDelta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_wheelDelta_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelDelta_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_wheelDelta = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13670,7 +14547,7 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_get(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_wheelDelta); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13682,12 +14559,17 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_set(PyObject *self, PyObject wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_linesPerAction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MouseEvent_m_linesPerAction_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_linesPerAction_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_linesPerAction = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -13710,7 +14592,7 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_linesPerAction); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13729,11 +14611,25 @@ static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObje int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxSetCursorEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SetCursorEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SetCursorEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSetCursorEvent *)new wxSetCursorEvent(arg1,arg2); @@ -13766,7 +14662,7 @@ static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13791,7 +14687,7 @@ static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13874,7 +14770,7 @@ static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13892,11 +14788,18 @@ static PyObject *_wrap_new_KeyEvent(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxKeyEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "keyType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_KeyEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_KeyEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxKeyEvent *)new wxKeyEvent(arg1); @@ -13929,7 +14832,7 @@ static PyObject *_wrap_KeyEvent_ControlDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13954,7 +14857,7 @@ static PyObject *_wrap_KeyEvent_MetaDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13979,7 +14882,7 @@ static PyObject *_wrap_KeyEvent_AltDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14004,7 +14907,7 @@ static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14029,7 +14932,7 @@ static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14054,7 +14957,7 @@ static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14079,7 +14982,7 @@ static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14104,7 +15007,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14129,7 +15032,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14221,7 +15124,7 @@ static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14246,7 +15149,7 @@ static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14258,12 +15161,17 @@ static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:KeyEvent_m_x_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_x = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14286,7 +15194,7 @@ static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_x); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14298,12 +15206,17 @@ static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:KeyEvent_m_y_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_y = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14326,7 +15239,7 @@ static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_y); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14338,12 +15251,17 @@ static PyObject *_wrap_KeyEvent_m_keyCode_set(PyObject *self, PyObject *args, Py wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_keyCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:KeyEvent_m_keyCode_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_keyCode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_keyCode = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -14366,7 +15284,7 @@ static PyObject *_wrap_KeyEvent_m_keyCode_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (long) ((arg1)->m_keyCode); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -14386,7 +15304,7 @@ static PyObject *_wrap_KeyEvent_m_controlDown_set(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_controlDown = arg2; @@ -14411,7 +15329,7 @@ static PyObject *_wrap_KeyEvent_m_controlDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_controlDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14431,7 +15349,7 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_set(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_shiftDown = arg2; @@ -14456,7 +15374,7 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_shiftDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14476,7 +15394,7 @@ static PyObject *_wrap_KeyEvent_m_altDown_set(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_altDown = arg2; @@ -14501,7 +15419,7 @@ static PyObject *_wrap_KeyEvent_m_altDown_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_altDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14521,7 +15439,7 @@ static PyObject *_wrap_KeyEvent_m_metaDown_set(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_metaDown = arg2; @@ -14546,7 +15464,7 @@ static PyObject *_wrap_KeyEvent_m_metaDown_get(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_metaDown); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14566,7 +15484,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_set(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_scanCode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_scanCode = arg2; @@ -14591,7 +15509,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_scanCode); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14611,7 +15529,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawCode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_rawCode = arg2; @@ -14636,7 +15554,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (unsigned int) ((arg1)->m_rawCode); - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14656,7 +15574,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawFlags_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned int) SPyObj_AsUnsignedInt(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } if (arg1) (arg1)->m_rawFlags = arg2; @@ -14681,7 +15599,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (unsigned int) ((arg1)->m_rawFlags); - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -14703,17 +15621,24 @@ static PyObject *_wrap_new_SizeEvent(PyObject *self, PyObject *args, PyObject *k wxSizeEvent *result; wxSize temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "sz",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_SizeEvent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SizeEvent",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = &temp1; if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizeEvent *)new wxSizeEvent((wxSize const &)*arg1,arg2); @@ -14943,17 +15868,24 @@ static PyObject *_wrap_new_MoveEvent(PyObject *self, PyObject *args, PyObject *k wxMoveEvent *result; wxPoint temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "pos",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_MoveEvent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MoveEvent",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = &temp1; if ( ! wxPoint_helper(obj0, &arg1)) SWIG_fail; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMoveEvent *)new wxMoveEvent((wxPoint const &)*arg1,arg2); @@ -15179,11 +16111,18 @@ static PyObject *_wrap_new_PaintEvent(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 = (int) 0 ; wxPaintEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_PaintEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaintEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPaintEvent *)new wxPaintEvent(arg1); @@ -15209,11 +16148,18 @@ static PyObject *_wrap_new_NcPaintEvent(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 = (int) 0 ; wxNcPaintEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_NcPaintEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_NcPaintEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNcPaintEvent *)new wxNcPaintEvent(arg1); @@ -15240,12 +16186,19 @@ static PyObject *_wrap_new_EraseEvent(PyObject *self, PyObject *args, PyObject * int arg1 = (int) 0 ; wxDC *arg2 = (wxDC *) (wxDC *) NULL ; wxEraseEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "Id",(char *) "dc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_EraseEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_EraseEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -15302,11 +16255,25 @@ static PyObject *_wrap_new_FocusEvent(PyObject *self, PyObject *args, PyObject * wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxFocusEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_FocusEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FocusEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFocusEvent *)new wxFocusEvent(arg1,arg2); @@ -15449,15 +16416,29 @@ static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObjec bool arg2 = (bool) True ; int arg3 = (int) 0 ; wxActivateEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "active",(char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iOi:new_ActivateEvent",kwnames,&arg1,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ActivateEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -15493,7 +16474,7 @@ static PyObject *_wrap_ActivateEvent_GetActive(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15511,11 +16492,18 @@ static PyObject *_wrap_new_InitDialogEvent(PyObject *self, PyObject *args, PyObj PyObject *resultobj; int arg1 = (int) 0 ; wxInitDialogEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "Id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_InitDialogEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_InitDialogEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxInitDialogEvent *)new wxInitDialogEvent(arg1); @@ -15543,12 +16531,26 @@ static PyObject *_wrap_new_MenuEvent(PyObject *self, PyObject *args, PyObject *k int arg2 = (int) 0 ; wxMenu *arg3 = (wxMenu *) NULL ; wxMenuEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid",(char *) "menu", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_MenuEvent",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_MenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -15584,7 +16586,7 @@ static PyObject *_wrap_MenuEvent_GetMenuId(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15609,7 +16611,7 @@ static PyObject *_wrap_MenuEvent_IsPopup(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15655,11 +16657,25 @@ static PyObject *_wrap_new_CloseEvent(PyObject *self, PyObject *args, PyObject * wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxCloseEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_CloseEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CloseEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCloseEvent *)new wxCloseEvent(arg1,arg2); @@ -15687,7 +16703,7 @@ static PyObject *_wrap_CloseEvent_SetLoggingOff(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetLoggingOff",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15722,7 +16738,7 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15743,7 +16759,7 @@ static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -15774,7 +16790,7 @@ static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCloseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15809,7 +16825,7 @@ static PyObject *_wrap_CloseEvent_CanVeto(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15834,7 +16850,7 @@ static PyObject *_wrap_CloseEvent_GetVeto(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15853,15 +16869,22 @@ static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *k int arg1 = (int) 0 ; bool arg2 = (bool) False ; wxShowEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "show", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_ShowEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_ShowEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -15892,7 +16915,7 @@ static PyObject *_wrap_ShowEvent_SetShow(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShowEvent_SetShow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShowEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15927,7 +16950,7 @@ static PyObject *_wrap_ShowEvent_GetShow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15946,15 +16969,22 @@ static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject int arg1 = (int) 0 ; bool arg2 = (bool) True ; wxIconizeEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "iconized", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_IconizeEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconizeEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -15990,7 +17020,7 @@ static PyObject *_wrap_IconizeEvent_Iconized(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16008,11 +17038,18 @@ static PyObject *_wrap_new_MaximizeEvent(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; int arg1 = (int) 0 ; wxMaximizeEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_MaximizeEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MaximizeEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMaximizeEvent *)new wxMaximizeEvent(arg1); @@ -16081,7 +17118,7 @@ static PyObject *_wrap_DropFilesEvent_GetNumberOfFiles(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16124,11 +17161,18 @@ static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; int arg1 = (int) 0 ; wxUpdateUIEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "commandId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_UpdateUIEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_UpdateUIEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxUpdateUIEvent *)new wxUpdateUIEvent(arg1); @@ -16161,7 +17205,7 @@ static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16186,7 +17230,7 @@ static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16242,7 +17286,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16267,7 +17311,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16292,7 +17336,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16312,7 +17356,7 @@ static PyObject *_wrap_UpdateUIEvent_Check(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Check",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16342,7 +17386,7 @@ static PyObject *_wrap_UpdateUIEvent_Enable(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Enable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxUpdateUIEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16402,11 +17446,16 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO static PyObject *_wrap_UpdateUIEvent_SetUpdateInterval(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "updateInterval", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:UpdateUIEvent_SetUpdateInterval",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetUpdateInterval",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxUpdateUIEvent::SetUpdateInterval(arg1); @@ -16436,7 +17485,7 @@ static PyObject *_wrap_UpdateUIEvent_GetUpdateInterval(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16461,7 +17510,7 @@ static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16492,11 +17541,16 @@ static PyObject *_wrap_UpdateUIEvent_ResetUpdateTime(PyObject *self, PyObject *a static PyObject *_wrap_UpdateUIEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:UpdateUIEvent_SetMode",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetMode",kwnames,&obj0)) goto fail; + { + arg1 = (wxUpdateUIMode) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxUpdateUIEvent::SetMode((wxUpdateUIMode )arg1); @@ -16526,7 +17580,7 @@ static PyObject *_wrap_UpdateUIEvent_GetMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16574,12 +17628,19 @@ static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *ar int arg1 = (int) 0 ; wxWindow *arg2 = (wxWindow *) NULL ; wxMouseCaptureChangedEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "gainedCapture", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_MouseCaptureChangedEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MouseCaptureChangedEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -16664,11 +17725,18 @@ static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, P PyObject *resultobj; int arg1 = (int) 0 ; wxPaletteChangedEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_PaletteChangedEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaletteChangedEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPaletteChangedEvent *)new wxPaletteChangedEvent(arg1); @@ -16748,11 +17816,18 @@ static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 = (int) 0 ; wxQueryNewPaletteEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_QueryNewPaletteEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryNewPaletteEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxQueryNewPaletteEvent *)new wxQueryNewPaletteEvent(arg1); @@ -16780,7 +17855,7 @@ static PyObject *_wrap_QueryNewPaletteEvent_SetPaletteRealized(PyObject *self, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryNewPaletteEvent_SetPaletteRealized",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryNewPaletteEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16815,7 +17890,7 @@ static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16869,7 +17944,7 @@ static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16889,7 +17964,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16924,7 +17999,7 @@ static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16944,7 +18019,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNavigationKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17152,12 +18227,26 @@ static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyOb wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxContextMenuEvent *result; wxPoint temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "type",(char *) "winid",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiO:new_ContextMenuEvent",kwnames,&arg1,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ContextMenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -17280,7 +18369,7 @@ static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIdleEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -17316,7 +18405,7 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17326,11 +18415,16 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P static PyObject *_wrap_IdleEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:IdleEvent_SetMode",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_SetMode",kwnames,&obj0)) goto fail; + { + arg1 = (wxIdleMode) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxIdleEvent::SetMode((wxIdleMode )arg1); @@ -17360,7 +18454,7 @@ static PyObject *_wrap_IdleEvent_GetMode(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17385,7 +18479,7 @@ static PyObject *_wrap_IdleEvent_CanSend(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17404,11 +18498,25 @@ static PyObject *_wrap_new_PyEvent(PyObject *self, PyObject *args, PyObject *kwa int arg1 = (int) 0 ; wxEventType arg2 = (wxEventType) wxEVT_NULL ; wxPyEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "winid",(char *) "commandType", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_PyEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyEvent *)new wxPyEvent(arg1,arg2); @@ -17511,11 +18619,25 @@ static PyObject *_wrap_new_PyCommandEvent(PyObject *self, PyObject *args, PyObje wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxPyCommandEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_PyCommandEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyCommandEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyCommandEvent *)new wxPyCommandEvent(arg1,arg2); @@ -17971,7 +19093,7 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -17982,7 +19104,7 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18031,7 +19153,7 @@ static PyObject *_wrap_PyApp_MainLoop(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18104,7 +19226,7 @@ static PyObject *_wrap_PyApp_Pending(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18129,7 +19251,7 @@ static PyObject *_wrap_PyApp_Dispatch(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18154,7 +19276,7 @@ static PyObject *_wrap_PyApp_ProcessIdle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18188,7 +19310,7 @@ static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18213,7 +19335,7 @@ static PyObject *_wrap_PyApp_IsActive(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18287,7 +19409,7 @@ static PyObject *_wrap_PyApp_SetExitOnFrameDelete(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetExitOnFrameDelete",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18322,7 +19444,7 @@ static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18342,7 +19464,7 @@ static PyObject *_wrap_PyApp_SetUseBestVisual(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetUseBestVisual",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18377,7 +19499,7 @@ static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18389,12 +19511,17 @@ static PyObject *_wrap_PyApp_SetPrintMode(PyObject *self, PyObject *args, PyObje wxPyApp *arg1 = (wxPyApp *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyApp_SetPrintMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetPrintMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrintMode(arg2); @@ -18427,7 +19554,7 @@ static PyObject *_wrap_PyApp_GetPrintMode(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18439,12 +19566,17 @@ static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObj wxPyApp *arg1 = (wxPyApp *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyApp_SetAssertMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetAssertMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAssertMode(arg2); @@ -18477,7 +19609,7 @@ static PyObject *_wrap_PyApp_GetAssertMode(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18499,7 +19631,7 @@ static PyObject *_wrap_PyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18521,7 +19653,7 @@ static PyObject *_wrap_PyApp_GetMacAboutMenuItemId(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18543,7 +19675,7 @@ static PyObject *_wrap_PyApp_GetMacPreferencesMenuItemId(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18565,7 +19697,7 @@ static PyObject *_wrap_PyApp_GetMacExitMenuItemId(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -18610,7 +19742,7 @@ static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacSupportPCMenuShortcuts",kwnames,&obj0)) goto fail; { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -18630,11 +19762,16 @@ static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObje static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacAboutMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacAboutMenuItemId",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacAboutMenuItemId(arg1); @@ -18652,11 +19789,16 @@ static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *arg static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacPreferencesMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacPreferencesMenuItemId",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacPreferencesMenuItemId(arg1); @@ -18674,11 +19816,16 @@ static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObjec static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:PyApp_SetMacExitMenuItemId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacExitMenuItemId",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPyApp::SetMacExitMenuItemId(arg1); @@ -18769,7 +19916,7 @@ static PyObject *_wrap_PyApp_GetComCtl32Version(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18819,7 +19966,7 @@ static PyObject *_wrap_Yield(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18841,7 +19988,7 @@ static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18865,7 +20012,7 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -18876,7 +20023,7 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18986,12 +20133,33 @@ static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyOb int arg3 = (int) 0 ; wxMenuItem *arg4 = (wxMenuItem *) NULL ; wxAcceleratorEntry *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiiO:new_AcceleratorEntry",kwnames,&arg1,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_AcceleratorEntry",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -19041,13 +20209,28 @@ static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyOb int arg4 ; wxMenuItem *arg5 = (wxMenuItem *) NULL ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii|O:AcceleratorEntry_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:AcceleratorEntry_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -19137,7 +20320,7 @@ static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19162,7 +20345,7 @@ static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19187,7 +20370,7 @@ static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19279,7 +20462,7 @@ static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19293,7 +20476,7 @@ static PyObject * AcceleratorTable_swigregister(PyObject *self, PyObject *args) Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_NullAcceleratorTable_set(PyObject *_val) { +static int _wrap_NullAcceleratorTable_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only."); return 1; } @@ -19345,7 +20528,7 @@ static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObje } -static int _wrap_PanelNameStr_set(PyObject *_val) { +static int _wrap_PanelNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable PanelNameStr is read-only."); return 1; } @@ -19381,15 +20564,21 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar 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 *)"Oi|OOlO:new_Window",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Window",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -19402,6 +20591,12 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -19475,16 +20670,22 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Window_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -19497,6 +20698,12 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -19511,7 +20718,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -19541,7 +20748,7 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -19552,7 +20759,7 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19577,7 +20784,7 @@ static PyObject *_wrap_Window_Destroy(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19602,7 +20809,7 @@ static PyObject *_wrap_Window_DestroyChildren(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19627,7 +20834,7 @@ static PyObject *_wrap_Window_IsBeingDeleted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19852,12 +21059,17 @@ static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kw wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -19890,7 +21102,7 @@ static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19912,7 +21124,7 @@ static PyObject *_wrap_Window_NewControlId(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19923,11 +21135,16 @@ static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyOb PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Window_NextControlId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_NextControlId",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxWindow::NextControlId(arg1); @@ -19935,7 +21152,7 @@ static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19946,11 +21163,16 @@ static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyOb PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Window_PrevControlId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PrevControlId",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxWindow::PrevControlId(arg1); @@ -19958,7 +21180,7 @@ static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20005,12 +21227,39 @@ static PyObject *_wrap_Window_SetDimensions(PyObject *self, PyObject *args, PyOb int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:Window_SetDimensions",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetDimensions",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3,arg4,arg5,arg6); @@ -20033,16 +21282,23 @@ static PyObject *_wrap_Window_SetRect(PyObject *self, PyObject *args, PyObject * wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rect",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Window_SetRect",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize((wxRect const &)*arg2,arg3); @@ -20063,12 +21319,22 @@ static PyObject *_wrap_Window_SetSizeWH(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_SetSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -20091,16 +21357,23 @@ static PyObject *_wrap_Window_Move(PyObject *self, PyObject *args, PyObject *kwa wxPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Window_Move",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_Move",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Move((wxPoint const &)*arg2,arg3); @@ -20122,12 +21395,29 @@ static PyObject *_wrap_Window_MoveXY(PyObject *self, PyObject *args, PyObject *k int arg3 ; int arg4 = (int) wxSIZE_USE_EXISTING ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:Window_MoveXY",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_MoveXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Move(arg2,arg3,arg4); @@ -20227,12 +21517,22 @@ static PyObject *_wrap_Window_SetClientSizeWH(PyObject *self, PyObject *args, Py int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Window_SetClientSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetClientSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetClientSize(arg2,arg3); @@ -20667,12 +21967,19 @@ static PyObject *_wrap_Window_Center(PyObject *self, PyObject *args, PyObject *k wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_Center",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Center",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Center(arg2); @@ -20692,12 +21999,19 @@ static PyObject *_wrap_Window_CenterOnScreen(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_CenterOnScreen",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_CenterOnScreen",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CenterOnScreen(arg2); @@ -20717,12 +22031,19 @@ static PyObject *_wrap_Window_CenterOnParent(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) wxBOTH ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Window_CenterOnParent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_CenterOnParent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CenterOnParent(arg2); @@ -20795,12 +22116,50 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj int arg6 = (int) -1 ; int arg7 = (int) -1 ; 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 *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH",(char *) "incW",(char *) "incH", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiii:Window_SetSizeHints",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_SetSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSizeHints(arg2,arg3,arg4,arg5,arg6,arg7); @@ -20823,12 +22182,36 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args int arg4 = (int) -1 ; int arg5 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|ii:Window_SetVirtualSizeHints",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_SetVirtualSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVirtualSizeHints(arg2,arg3,arg4,arg5); @@ -20861,7 +22244,7 @@ static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20886,7 +22269,7 @@ static PyObject *_wrap_Window_GetMinHeight(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20911,7 +22294,7 @@ static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20936,7 +22319,7 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21009,12 +22392,22 @@ static PyObject *_wrap_Window_SetVirtualSizeWH(PyObject *self, PyObject *args, P int arg2 ; int 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 *)"Oii:Window_SetVirtualSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetVirtualSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVirtualSize(arg2,arg3); @@ -21140,7 +22533,7 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -21151,7 +22544,7 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21176,7 +22569,7 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21198,7 +22591,7 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -21209,7 +22602,7 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21234,7 +22627,7 @@ static PyObject *_wrap_Window_Disable(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21259,7 +22652,7 @@ static PyObject *_wrap_Window_IsShown(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21284,7 +22677,7 @@ static PyObject *_wrap_Window_IsEnabled(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21296,12 +22689,17 @@ static PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *self, PyObject *args, wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetWindowStyleFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindowStyleFlag(arg2); @@ -21334,7 +22732,7 @@ static PyObject *_wrap_Window_GetWindowStyleFlag(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21346,12 +22744,17 @@ static PyObject *_wrap_Window_SetWindowStyle(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetWindowStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWindowStyle(arg2); @@ -21384,7 +22787,7 @@ static PyObject *_wrap_Window_GetWindowStyle(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21397,12 +22800,17 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_HasFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->HasFlag(arg2); @@ -21410,7 +22818,7 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21435,7 +22843,7 @@ static PyObject *_wrap_Window_IsRetained(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21447,12 +22855,17 @@ static PyObject *_wrap_Window_SetExtraStyle(PyObject *self, PyObject *args, PyOb wxWindow *arg1 = (wxWindow *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "exStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_SetExtraStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetExtraStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraStyle(arg2); @@ -21485,7 +22898,7 @@ static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21506,7 +22919,7 @@ static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -21537,7 +22950,7 @@ static PyObject *_wrap_Window_SetThemeEnabled(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetThemeEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -21572,7 +22985,7 @@ static PyObject *_wrap_Window_GetThemeEnabled(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21597,7 +23010,7 @@ static PyObject *_wrap_Window_ShouldInheritColours(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21694,7 +23107,7 @@ static PyObject *_wrap_Window_AcceptsFocus(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21719,7 +23132,7 @@ static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21907,7 +23320,7 @@ static PyObject *_wrap_Window_IsTopLevel(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21935,7 +23348,7 @@ static PyObject *_wrap_Window_Reparent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22002,12 +23415,17 @@ static PyObject *_wrap_Window_FindWindowById(PyObject *self, PyObject *args, PyO long arg2 ; wxWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_FindWindowById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FindWindowById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->FindWindow(arg2); @@ -22163,7 +23581,7 @@ static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -22204,7 +23622,7 @@ static PyObject *_wrap_Window_RemoveEventHandler(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22331,12 +23749,27 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO int arg4 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hotkeyId",(char *) "modifiers",(char *) "keycode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:Window_RegisterHotKey",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_RegisterHotKey",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxWindow_RegisterHotKey(arg1,arg2,arg3,arg4); @@ -22344,7 +23777,7 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22357,12 +23790,17 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hotkeyId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_UnregisterHotKey",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_UnregisterHotKey",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxWindow_UnregisterHotKey(arg1,arg2); @@ -22370,7 +23808,7 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22599,12 +24037,22 @@ static PyObject *_wrap_Window_WarpPointer(PyObject *self, PyObject *args, PyObje int arg2 ; int 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 *)"Oii:Window_WarpPointer",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_WarpPointer",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->WarpPointer(arg2,arg3); @@ -22709,7 +24157,7 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22732,7 +24180,7 @@ static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -22976,12 +24424,36 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject int arg5 = (int) 1 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|ii:Window_IsExposed",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_IsExposed",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->IsExposed(arg2,arg3,arg4,arg5); @@ -22989,7 +24461,7 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23021,7 +24493,7 @@ static PyObject *_wrap_Window_IsExposedPoint(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23053,7 +24525,7 @@ static PyObject *_wrap_Window_isExposedRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23085,7 +24557,7 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23117,7 +24589,7 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23206,7 +24678,7 @@ static PyObject *_wrap_Window_SetCursor(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23265,7 +24737,7 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23370,7 +24842,7 @@ static PyObject *_wrap_Window_GetCharHeight(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23395,7 +24867,7 @@ static PyObject *_wrap_Window_GetCharWidth(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23704,12 +25176,22 @@ static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject int 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 *)"Oii:Window_HitTestXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->HitTest(arg2,arg3); @@ -23717,7 +25199,7 @@ static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23749,7 +25231,7 @@ static PyObject *_wrap_Window_HitTest(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23762,12 +25244,17 @@ static PyObject *_wrap_Window_GetBorderFlags(PyObject *self, PyObject *args, PyO long arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Window_GetBorderFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetBorderFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetBorder(arg2); @@ -23775,7 +25262,7 @@ static PyObject *_wrap_Window_GetBorderFlags(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23800,7 +25287,7 @@ static PyObject *_wrap_Window_GetBorder(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23812,12 +25299,19 @@ static PyObject *_wrap_Window_UpdateWindowUI(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; long arg2 = (long) wxUPDATE_UI_NONE ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:Window_UpdateWindowUI",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_UpdateWindowUI",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->UpdateWindowUI(arg2); @@ -23841,13 +25335,23 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "menu",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:Window_PopupMenuXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_PopupMenuXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->PopupMenu(arg2,arg3,arg4); @@ -23855,7 +25359,7 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23890,7 +25394,7 @@ static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23915,7 +25419,7 @@ static PyObject *_wrap_Window_GetHandle(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -23958,12 +25462,17 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_HasScrollbar",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasScrollbar",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxWindow const *)arg1)->HasScrollbar(arg2); @@ -23971,7 +25480,7 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23987,16 +25496,36 @@ static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObj int arg5 ; bool arg6 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient",(char *) "pos",(char *) "thumbvisible",(char *) "range",(char *) "refresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|O:Window_SetScrollbar",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -24021,16 +25550,26 @@ static PyObject *_wrap_Window_SetScrollPos(PyObject *self, PyObject *args, PyObj int arg3 ; bool arg4 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient",(char *) "pos",(char *) "refresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Window_SetScrollPos",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_SetScrollPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -24054,12 +25593,17 @@ static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollPos",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollPos",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollPos(arg2); @@ -24067,7 +25611,7 @@ static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24080,12 +25624,17 @@ static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyO int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollThumb",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollThumb",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollThumb(arg2); @@ -24093,7 +25642,7 @@ static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24106,12 +25655,17 @@ static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyO int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_GetScrollRange",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollRange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxWindow const *)arg1)->GetScrollRange(arg2); @@ -24119,7 +25673,7 @@ static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24133,13 +25687,23 @@ static PyObject *_wrap_Window_ScrollWindow(PyObject *self, PyObject *args, PyObj int arg3 ; wxRect *arg4 = (wxRect *) NULL ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Window_ScrollWindow",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_ScrollWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -24163,12 +25727,17 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lines", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_ScrollLines",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollLines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollLines(arg2); @@ -24176,7 +25745,7 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24189,12 +25758,17 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pages", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Window_ScrollPages",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollPages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollPages(arg2); @@ -24202,7 +25776,7 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24227,7 +25801,7 @@ static PyObject *_wrap_Window_LineUp(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24252,7 +25826,7 @@ static PyObject *_wrap_Window_LineDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24277,7 +25851,7 @@ static PyObject *_wrap_Window_PageUp(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24302,7 +25876,7 @@ static PyObject *_wrap_Window_PageDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24579,7 +26153,7 @@ static PyObject *_wrap_Window_DragAcceptFiles(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_DragAcceptFiles",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -24661,7 +26235,7 @@ static PyObject *_wrap_Window_SetAutoLayout(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetAutoLayout",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -24696,7 +26270,7 @@ static PyObject *_wrap_Window_GetAutoLayout(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24721,7 +26295,7 @@ static PyObject *_wrap_Window_Layout(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24745,7 +26319,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -24780,7 +26354,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -24891,12 +26465,17 @@ static PyObject *_wrap_FindWindowById(PyObject *self, PyObject *args, PyObject * long arg1 ; wxWindow *arg2 = (wxWindow *) NULL ; wxWindow *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "parent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l|O:FindWindowById",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FindWindowById",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -25017,7 +26596,7 @@ static PyObject *_wrap_Window_FromHWND(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_FromHWND",kwnames,&obj0)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -25108,7 +26687,7 @@ static PyObject *_wrap_Validator_Validate(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25133,7 +26712,7 @@ static PyObject *_wrap_Validator_TransferToWindow(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25158,7 +26737,7 @@ static PyObject *_wrap_Validator_TransferFromWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25234,7 +26813,7 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -25244,11 +26823,18 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Validator_SetBellOnError(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) True ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "doIt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:Validator_SetBellOnError",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Validator_SetBellOnError",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxValidator::SetBellOnError(arg1); @@ -25301,14 +26887,21 @@ static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *self, PyObject *ar PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:PyValidator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyValidator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->_setCallbackInfo(arg2,arg3,arg4); @@ -25330,7 +26923,7 @@ static PyObject * PyValidator_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_DefaultValidator_set(PyObject *_val) { +static int _wrap_DefaultValidator_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DefaultValidator is read-only."); return 1; } @@ -25352,11 +26945,12 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs wxMenu *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Ol:new_Menu",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Menu",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -25364,6 +26958,12 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs temp1 = True; } } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenu *)new wxMenu((wxString const &)*arg1,arg2); @@ -25400,14 +27000,20 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Append",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25420,6 +27026,12 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa temp4 = True; } } + if (obj4) { + { + arg5 = (wxItemKind) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Append(arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxItemKind )arg5); @@ -25490,14 +27102,19 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25553,14 +27170,19 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25617,6 +27239,7 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject bool temp3 = False ; bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -25624,8 +27247,12 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_AppendMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_AppendMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -25741,7 +27368,7 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -25775,16 +27402,22 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|Oi:Menu_Insert",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Menu_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -25799,6 +27432,12 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa temp5 = True; } } + if (obj5) { + { + arg6 = (wxItemKind) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Insert(arg2,arg3,(wxString const &)*arg4,(wxString const &)*arg5,(wxItemKind )arg6); @@ -25845,7 +27484,7 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_InsertSeparator",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -25877,16 +27516,21 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -25946,16 +27590,21 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -26016,6 +27665,7 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject bool temp6 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; @@ -26023,10 +27673,14 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -26116,14 +27770,20 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Prepend",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26136,6 +27796,12 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw temp4 = True; } } + if (obj4) { + { + arg5 = (wxItemKind) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Prepend(arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxItemKind )arg5); @@ -26206,14 +27872,19 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26269,14 +27940,19 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26333,6 +28009,7 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject bool temp3 = False ; bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -26340,8 +28017,12 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_PrependMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_PrependMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26393,12 +28074,17 @@ static PyObject *_wrap_Menu_Remove(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Remove",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Remove",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)(arg1)->Remove(arg2); @@ -26451,12 +28137,17 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Delete",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Delete",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Delete(arg2); @@ -26464,7 +28155,7 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26492,7 +28183,7 @@ static PyObject *_wrap_Menu_DeleteItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26529,12 +28220,17 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_DestroyId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DestroyId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Destroy(arg2); @@ -26542,7 +28238,7 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26570,7 +28266,7 @@ static PyObject *_wrap_Menu_DestroyItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26595,7 +28291,7 @@ static PyObject *_wrap_Menu_GetMenuItemCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -26653,7 +28349,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -26674,12 +28370,17 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *self, PyObject *args, PyObjec int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_FindItemById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)((wxMenu const *)arg1)->FindItem(arg2); @@ -26710,7 +28411,7 @@ static PyObject *_wrap_Menu_FindItemByPosition(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemByPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -26735,15 +28436,20 @@ static PyObject *_wrap_Menu_Enable(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -26766,12 +28472,17 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsEnabled",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenu const *)arg1)->IsEnabled(arg2); @@ -26779,7 +28490,7 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26792,15 +28503,20 @@ static PyObject *_wrap_Menu_Check(PyObject *self, PyObject *args, PyObject *kwar int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "check", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Check",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -26823,12 +28539,17 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsChecked",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsChecked",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenu const *)arg1)->IsChecked(arg2); @@ -26836,7 +28557,7 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26850,13 +28571,18 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26890,12 +28616,17 @@ static PyObject *_wrap_Menu_GetLabel(PyObject *self, PyObject *args, PyObject *k int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetLabel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetLabel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenu const *)arg1)->GetLabel(arg2); @@ -26923,13 +28654,18 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -26963,12 +28699,17 @@ static PyObject *_wrap_Menu_GetHelpString(PyObject *self, PyObject *args, PyObje int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetHelpString",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetHelpString",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenu const *)arg1)->GetHelpString(arg2); @@ -27186,7 +28927,7 @@ static PyObject *_wrap_Menu_GetStyle(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -27318,7 +29059,7 @@ static PyObject *_wrap_Menu_IsAttached(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -27390,11 +29131,18 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa PyObject *resultobj; long arg1 = (long) 0 ; wxMenuBar *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|l:new_MenuBar",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MenuBar",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuBar *)new wxMenuBar(arg1); @@ -27440,7 +29188,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -27474,7 +29222,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -27490,7 +29238,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -27523,7 +29271,7 @@ static PyObject *_wrap_MenuBar_GetMenuCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -27544,7 +29292,7 @@ static PyObject *_wrap_MenuBar_GetMenu(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetMenu",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27582,7 +29330,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -27629,7 +29377,7 @@ static PyObject *_wrap_MenuBar_Remove(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_Remove",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27663,11 +29411,11 @@ static PyObject *_wrap_MenuBar_EnableTop(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_EnableTop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -27698,7 +29446,7 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabledTop",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27708,7 +29456,7 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -27731,7 +29479,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabelTop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27775,7 +29523,7 @@ static PyObject *_wrap_MenuBar_GetLabelTop(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabelTop",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -27832,7 +29580,7 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -27861,12 +29609,17 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *self, PyObject *args, PyOb int arg2 ; wxMenuItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_FindItemById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_FindItemById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMenuItem *)((wxMenuBar const *)arg1)->FindItem(arg2); @@ -27909,7 +29662,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -27930,15 +29683,20 @@ static PyObject *_wrap_MenuBar_Enable(PyObject *self, PyObject *args, PyObject * int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "enable", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -27961,15 +29719,20 @@ static PyObject *_wrap_MenuBar_Check(PyObject *self, PyObject *args, PyObject *k int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "check", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Check",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -27992,12 +29755,17 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsChecked",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsChecked",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuBar const *)arg1)->IsChecked(arg2); @@ -28005,7 +29773,7 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28018,12 +29786,17 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsEnabled",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabled",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxMenuBar const *)arg1)->IsEnabled(arg2); @@ -28031,7 +29804,7 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28045,13 +29818,18 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "label", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -28085,12 +29863,17 @@ static PyObject *_wrap_MenuBar_GetLabel(PyObject *self, PyObject *args, PyObject int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetLabel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenuBar const *)arg1)->GetLabel(arg2); @@ -28118,13 +29901,18 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id",(char *) "helpString", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -28158,12 +29946,17 @@ static PyObject *_wrap_MenuBar_GetHelpString(PyObject *self, PyObject *args, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetHelpString",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetHelpString",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxMenuBar const *)arg1)->GetHelpString(arg2); @@ -28229,7 +30022,7 @@ static PyObject *_wrap_MenuBar_IsAttached(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28308,17 +30101,25 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw bool temp3 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parentMenu",(char *) "id",(char *) "text",(char *) "help",(char *) "kind",(char *) "subMenu", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiOOiO:new_MenuItem",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_MenuItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if (obj0) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -28333,6 +30134,12 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw temp4 = True; } } + if (obj4) { + { + arg5 = (wxItemKind) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -28427,12 +30234,17 @@ static PyObject *_wrap_MenuItem_SetId(PyObject *self, PyObject *args, PyObject * wxMenuItem *arg1 = (wxMenuItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuItem_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -28465,7 +30277,7 @@ static PyObject *_wrap_MenuItem_GetId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -28490,7 +30302,7 @@ static PyObject *_wrap_MenuItem_IsSeparator(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28664,7 +30476,7 @@ static PyObject *_wrap_MenuItem_GetKind(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -28684,7 +30496,7 @@ static PyObject *_wrap_MenuItem_SetCheckable(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetCheckable",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -28719,7 +30531,7 @@ static PyObject *_wrap_MenuItem_IsCheckable(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28744,7 +30556,7 @@ static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28819,7 +30631,7 @@ static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -28855,7 +30667,7 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -28876,7 +30688,7 @@ static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -28912,7 +30724,7 @@ static PyObject *_wrap_MenuItem_IsChecked(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -29350,12 +31162,17 @@ static PyObject *_wrap_MenuItem_SetMarginWidth(PyObject *self, PyObject *args, P wxMenuItem *arg1 = (wxMenuItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "nWidth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuItem_SetMarginWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetMarginWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMarginWidth(arg2); @@ -29388,7 +31205,7 @@ static PyObject *_wrap_MenuItem_GetMarginWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -29410,7 +31227,7 @@ static PyObject *_wrap_MenuItem_GetDefaultMarginWidth(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -29435,7 +31252,7 @@ static PyObject *_wrap_MenuItem_IsOwnerDrawn(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -29456,7 +31273,7 @@ static PyObject *_wrap_MenuItem_SetOwnerDrawn(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -29563,7 +31380,7 @@ static PyObject * MenuItem_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ControlNameStr_set(PyObject *_val) { +static int _wrap_ControlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ControlNameStr is read-only."); return 1; } @@ -29601,16 +31418,22 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa wxSize temp4 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlOO:new_Control",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:new_Control",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -29623,6 +31446,12 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg6 == NULL) { @@ -29704,17 +31533,23 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * bool temp8 = 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 *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlOO:Control_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:Control_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -29727,6 +31562,12 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { @@ -29747,7 +31588,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp8) delete arg8; @@ -29901,7 +31742,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -29977,18 +31818,23 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|O:ItemContainer_Insert",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ItemContainer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { arg4 = obj3; } @@ -29999,7 +31845,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -30043,12 +31889,17 @@ static PyObject *_wrap_ItemContainer_Delete(PyObject *self, PyObject *args, PyOb wxItemContainer *arg1 = (wxItemContainer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_Delete",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Delete",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Delete(arg2); @@ -30081,7 +31932,7 @@ static PyObject *_wrap_ItemContainer_GetCount(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -30106,7 +31957,7 @@ static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -30119,12 +31970,17 @@ static PyObject *_wrap_ItemContainer_GetString(PyObject *self, PyObject *args, P int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_GetString",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetString",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxItemContainer const *)arg1)->GetString(arg2); @@ -30179,13 +32035,18 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ItemContainer_SetString",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -30239,7 +32100,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -30259,12 +32120,17 @@ static PyObject *_wrap_ItemContainer_Select(PyObject *self, PyObject *args, PyOb wxItemContainer *arg1 = (wxItemContainer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_Select",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Select",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Select(arg2); @@ -30297,7 +32163,7 @@ static PyObject *_wrap_ItemContainer_GetSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -30341,12 +32207,17 @@ static PyObject *_wrap_ItemContainer_GetClientData(PyObject *self, PyObject *arg int arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ItemContainer_GetClientData",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetClientData",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxItemContainer_GetClientData(arg1,arg2); @@ -30367,13 +32238,18 @@ static PyObject *_wrap_ItemContainer_SetClientData(PyObject *self, PyObject *arg int arg2 ; PyObject *arg3 = (PyObject *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n",(char *) "clientData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ItemContainer_SetClientData",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetClientData",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxItemContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30434,12 +32310,37 @@ static PyObject *_wrap_new_SizerItemSpacer(PyObject *self, PyObject *args, PyObj int arg5 ; wxObject *arg6 = (wxObject *) 0 ; wxSizerItem *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiiiiO:new_SizerItemSpacer",kwnames,&arg1,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_SizerItemSpacer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30464,13 +32365,28 @@ static PyObject *_wrap_new_SizerItemWindow(PyObject *self, PyObject *args, PyObj wxObject *arg5 = (wxObject *) 0 ; wxSizerItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "window",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:new_SizerItemWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_SizerItemWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30495,13 +32411,28 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *self, PyObject *args, PyObje wxObject *arg5 = (wxObject *) 0 ; wxSizerItem *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "sizer",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiO:new_SizerItemSizer",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:new_SizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30692,12 +32623,22 @@ static PyObject *_wrap_SizerItem_SetInitSize(PyObject *self, PyObject *args, PyO int arg2 ; int 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 *)"Oii:SizerItem_SetInitSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetInitSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetInitSize(arg2,arg3); @@ -30718,12 +32659,22 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:SizerItem_SetRatioWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetRatioWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRatio(arg2,arg3); @@ -30772,12 +32723,17 @@ static PyObject *_wrap_SizerItem_SetRatio(PyObject *self, PyObject *args, PyObje wxSizerItem *arg1 = (wxSizerItem *) 0 ; float arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ratio", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Of:SizerItem_SetRatio",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetRatio",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (float) SWIG_PyObj_AsFloat(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRatio(arg2); @@ -30810,7 +32766,7 @@ static PyObject *_wrap_SizerItem_GetRatio(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromFloat((float)result); return resultobj; fail: return NULL; @@ -30835,7 +32791,7 @@ static PyObject *_wrap_SizerItem_IsWindow(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -30860,7 +32816,7 @@ static PyObject *_wrap_SizerItem_IsSizer(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -30885,7 +32841,7 @@ static PyObject *_wrap_SizerItem_IsSpacer(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -30897,12 +32853,17 @@ static PyObject *_wrap_SizerItem_SetProportion(PyObject *self, PyObject *args, P wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetProportion",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetProportion",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetProportion(arg2); @@ -30935,7 +32896,7 @@ static PyObject *_wrap_SizerItem_GetProportion(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -30947,12 +32908,17 @@ static PyObject *_wrap_SizerItem_SetFlag(PyObject *self, PyObject *args, PyObjec wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetFlag",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetFlag",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlag(arg2); @@ -30985,7 +32951,7 @@ static PyObject *_wrap_SizerItem_GetFlag(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -30997,12 +32963,17 @@ static PyObject *_wrap_SizerItem_SetBorder(PyObject *self, PyObject *args, PyObj wxSizerItem *arg1 = (wxSizerItem *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SizerItem_SetBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorder(arg2); @@ -31035,7 +33006,7 @@ static PyObject *_wrap_SizerItem_GetBorder(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -31222,7 +33193,7 @@ static PyObject *_wrap_SizerItem_Show(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_Show",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -31257,7 +33228,7 @@ static PyObject *_wrap_SizerItem_IsShown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -31362,14 +33333,35 @@ static PyObject *_wrap_Sizer_Add(PyObject *self, PyObject *args, PyObject *kwarg PyObject *arg6 = (PyObject *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiiO:Sizer_Add",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Sizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { arg6 = obj5; } @@ -31397,15 +33389,41 @@ static PyObject *_wrap_Sizer_Insert(PyObject *self, PyObject *args, PyObject *kw int arg6 = (int) 0 ; PyObject *arg7 = (PyObject *) NULL ; 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 *) "before",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|iiiO:Sizer_Insert",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Sizer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } arg3 = obj2; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { arg7 = obj6; } @@ -31433,14 +33451,35 @@ static PyObject *_wrap_Sizer_Prepend(PyObject *self, PyObject *args, PyObject *k PyObject *arg6 = (PyObject *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "proportion",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiiO:Sizer_Prepend",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Sizer_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { arg6 = obj5; } @@ -31479,7 +33518,7 @@ static PyObject *_wrap_Sizer_Remove(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -31562,7 +33601,7 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxSizerItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -31615,12 +33654,32 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Sizer_SetDimension",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Sizer_SetDimension",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDimension(arg2,arg3,arg4,arg5); @@ -31957,7 +34016,7 @@ static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwa if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -32041,7 +34100,7 @@ static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwar arg2 = obj1; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -32107,7 +34166,7 @@ static PyObject *_wrap_Sizer_IsShown(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -32127,7 +34186,7 @@ static PyObject *_wrap_Sizer_ShowItems(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_ShowItems",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -32214,11 +34273,18 @@ static PyObject *_wrap_new_BoxSizer(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; int arg1 = (int) wxHORIZONTAL ; wxBoxSizer *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_BoxSizer",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_BoxSizer",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBoxSizer *)new wxBoxSizer(arg1); @@ -32251,7 +34317,7 @@ static PyObject *_wrap_BoxSizer_GetOrientation(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32263,12 +34329,17 @@ static PyObject *_wrap_BoxSizer_SetOrientation(PyObject *self, PyObject *args, P wxBoxSizer *arg1 = (wxBoxSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:BoxSizer_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BoxSizer_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBoxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -32349,12 +34420,19 @@ static PyObject *_wrap_new_StaticBoxSizer(PyObject *self, PyObject *args, PyObje int arg2 = (int) wxHORIZONTAL ; wxStaticBoxSizer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "box",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_StaticBoxSizer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_StaticBoxSizer",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStaticBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxStaticBoxSizer *)new wxStaticBoxSizer(arg1,arg2); @@ -32463,11 +34541,39 @@ static PyObject *_wrap_new_GridSizer(PyObject *self, PyObject *args, PyObject *k int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxGridSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "rows",(char *) "cols",(char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_GridSizer",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_GridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridSizer *)new wxGridSizer(arg1,arg2,arg3,arg4); @@ -32540,12 +34646,17 @@ static PyObject *_wrap_GridSizer_SetCols(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetCols",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetCols",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCols(arg2); @@ -32565,12 +34676,17 @@ static PyObject *_wrap_GridSizer_SetRows(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetRows",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetRows",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRows(arg2); @@ -32590,12 +34706,17 @@ static PyObject *_wrap_GridSizer_SetVGap(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "gap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetVGap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetVGap",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVGap(arg2); @@ -32615,12 +34736,17 @@ static PyObject *_wrap_GridSizer_SetHGap(PyObject *self, PyObject *args, PyObjec wxGridSizer *arg1 = (wxGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "gap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridSizer_SetHGap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetHGap",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHGap(arg2); @@ -32653,7 +34779,7 @@ static PyObject *_wrap_GridSizer_GetCols(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32678,7 +34804,7 @@ static PyObject *_wrap_GridSizer_GetRows(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32703,7 +34829,7 @@ static PyObject *_wrap_GridSizer_GetVGap(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32728,7 +34854,7 @@ static PyObject *_wrap_GridSizer_GetHGap(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32749,11 +34875,39 @@ static PyObject *_wrap_new_FlexGridSizer(PyObject *self, PyObject *args, PyObjec int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxFlexGridSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "rows",(char *) "cols",(char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_FlexGridSizer",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_FlexGridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFlexGridSizer *)new wxFlexGridSizer(arg1,arg2,arg3,arg4); @@ -32828,16 +34982,23 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableRow(PyObject *self, PyObject *ar int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "idx",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddGrowableRow(arg2,arg3); @@ -32865,7 +35026,7 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableRow(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -32889,16 +35050,23 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableCol(PyObject *self, PyObject *ar int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "idx",(char *) "proportion", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddGrowableCol(arg2,arg3); @@ -32926,7 +35094,7 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableCol(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -32948,12 +35116,17 @@ static PyObject *_wrap_FlexGridSizer_SetFlexibleDirection(PyObject *self, PyObje wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "direction", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlexibleDirection(arg2); @@ -32986,7 +35159,7 @@ static PyObject *_wrap_FlexGridSizer_GetFlexibleDirection(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -32998,12 +35171,17 @@ static PyObject *_wrap_FlexGridSizer_SetNonFlexibleGrowMode(PyObject *self, PyOb wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFlexSizerGrowMode) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNonFlexibleGrowMode((wxFlexSizerGrowMode )arg2); @@ -33036,7 +35214,7 @@ static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -33127,11 +35305,25 @@ static PyObject *_wrap_new_GBPosition(PyObject *self, PyObject *args, PyObject * int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxGBPosition *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GBPosition",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBPosition",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBPosition *)new wxGBPosition(arg1,arg2); @@ -33164,7 +35356,7 @@ static PyObject *_wrap_GBPosition_GetRow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -33189,7 +35381,7 @@ static PyObject *_wrap_GBPosition_GetCol(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -33201,12 +35393,17 @@ static PyObject *_wrap_GBPosition_SetRow(PyObject *self, PyObject *args, PyObjec wxGBPosition *arg1 = (wxGBPosition *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBPosition_SetRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRow(arg2); @@ -33226,12 +35423,17 @@ static PyObject *_wrap_GBPosition_SetCol(PyObject *self, PyObject *args, PyObjec wxGBPosition *arg1 = (wxGBPosition *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBPosition_SetCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCol(arg2); @@ -33271,7 +35473,7 @@ static PyObject *_wrap_GBPosition___eq__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33303,7 +35505,7 @@ static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33316,12 +35518,26 @@ static PyObject *_wrap_GBPosition_Set(PyObject *self, PyObject *args, PyObject * int arg2 = (int) 0 ; int arg3 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:GBPosition_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GBPosition_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGBPosition_Set(arg1,arg2,arg3); @@ -33373,11 +35589,25 @@ static PyObject *_wrap_new_GBSpan(PyObject *self, PyObject *args, PyObject *kwar int arg1 = (int) 1 ; int arg2 = (int) 1 ; wxGBSpan *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "rowspan",(char *) "colspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GBSpan",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBSpan",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGBSpan *)new wxGBSpan(arg1,arg2); @@ -33410,7 +35640,7 @@ static PyObject *_wrap_GBSpan_GetRowspan(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -33435,7 +35665,7 @@ static PyObject *_wrap_GBSpan_GetColspan(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -33447,12 +35677,17 @@ static PyObject *_wrap_GBSpan_SetRowspan(PyObject *self, PyObject *args, PyObjec wxGBSpan *arg1 = (wxGBSpan *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rowspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBSpan_SetRowspan",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetRowspan",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowspan(arg2); @@ -33472,12 +35707,17 @@ static PyObject *_wrap_GBSpan_SetColspan(PyObject *self, PyObject *args, PyObjec wxGBSpan *arg1 = (wxGBSpan *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "colspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GBSpan_SetColspan",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetColspan",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColspan(arg2); @@ -33517,7 +35757,7 @@ static PyObject *_wrap_GBSpan___eq__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33549,7 +35789,7 @@ static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33562,12 +35802,26 @@ static PyObject *_wrap_GBSpan_Set(PyObject *self, PyObject *args, PyObject *kwar int arg2 = (int) 1 ; int arg3 = (int) 1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rowspan",(char *) "colspan", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:GBSpan_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GBSpan_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGBSpan_Set(arg1,arg2,arg3); @@ -33614,7 +35868,7 @@ static PyObject * GBSpan_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_DefaultSpan_set(PyObject *_val) { +static int _wrap_DefaultSpan_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DefaultSpan is read-only."); return 1; } @@ -33664,12 +35918,14 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "window",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiiO:new_GBSizerItemWindow",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GBSizerItemWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -33679,6 +35935,14 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO arg3 = &temp3; if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33708,12 +35972,14 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "sizer",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiiO:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -33723,6 +35989,14 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb arg3 = &temp3; if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33750,14 +36024,26 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO wxGBSizerItem *result; wxGBPosition temp3 ; wxGBSpan temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiOOiiO:new_GBSizerItemSpacer",kwnames,&arg1,&arg2,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:new_GBSizerItemSpacer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxGBPosition_helper(obj2, &arg3)) SWIG_fail; @@ -33766,6 +36052,14 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO arg4 = &temp4; if ( ! wxGBSpan_helper(obj3, &arg4)) SWIG_fail; } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33864,7 +36158,7 @@ static PyObject *_wrap_GBSizerItem_SetPos(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33896,7 +36190,7 @@ static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33924,7 +36218,7 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_0(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -33960,7 +36254,7 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_1(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34133,11 +36427,25 @@ static PyObject *_wrap_new_GridBagSizer(PyObject *self, PyObject *args, PyObject int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxGridBagSizer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "vgap",(char *) "hgap", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridBagSizer",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridBagSizer",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridBagSizer *)new wxGridBagSizer(arg1,arg2); @@ -34169,12 +36477,14 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "item",(char *) "pos",(char *) "span",(char *) "flag",(char *) "border",(char *) "userData", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OiiO:GridBagSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:GridBagSizer_Add",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; { @@ -34187,6 +36497,18 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject if ( ! wxGBSpan_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { arg7 = obj6; } @@ -34197,7 +36519,7 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34225,7 +36547,7 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34361,7 +36683,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_2(PyObject *self, PyOb if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -34456,7 +36778,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar } if (_v) { { - SPyObj_AsUnsignedInt(argv[1]); + SWIG_PyObj_AsUnsignedLong(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -34500,7 +36822,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34532,7 +36854,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34553,7 +36875,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyOb if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -34567,7 +36889,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34658,7 +36980,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar } if (_v) { { - SPyObj_AsUnsignedInt(argv[1]); + SWIG_PyObj_AsUnsignedLong(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -34751,7 +37073,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_2(PyObject *self, PyObject if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -34846,7 +37168,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args) } if (_v) { { - SPyObj_AsUnsignedInt(argv[1]); + SWIG_PyObj_AsUnsignedLong(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -34890,7 +37212,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34922,7 +37244,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -34943,7 +37265,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -34957,7 +37279,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -35048,7 +37370,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args) } if (_v) { { - SPyObj_AsUnsignedInt(argv[1]); + SWIG_PyObj_AsUnsignedLong(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -35357,7 +37679,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_0(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -35398,7 +37720,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_1(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -35515,14 +37837,38 @@ static PyObject *_wrap_IndividualLayoutConstraint_Set(PyObject *self, PyObject * int arg5 = (int) 0 ; int arg6 = (int) wxLAYOUT_DEFAULT_MARGIN ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "rel",(char *) "otherW",(char *) "otherE",(char *) "val",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOi|ii:IndividualLayoutConstraint_Set",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:IndividualLayoutConstraint_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxRelationship) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (wxEdge) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set((wxRelationship )arg2,arg3,(wxEdge )arg4,arg5,arg6); @@ -35544,13 +37890,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_LeftOf(PyObject *self, PyObjec int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_LeftOf",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_LeftOf",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->LeftOf(arg2,arg3); @@ -35572,13 +37925,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_RightOf(PyObject *self, PyObje int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_RightOf",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_RightOf",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RightOf(arg2,arg3); @@ -35600,13 +37960,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_Above(PyObject *self, PyObject int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_Above",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_Above",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Above(arg2,arg3); @@ -35628,13 +37995,20 @@ static PyObject *_wrap_IndividualLayoutConstraint_Below(PyObject *self, PyObject int arg3 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sibling",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:IndividualLayoutConstraint_Below",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IndividualLayoutConstraint_Below",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Below(arg2,arg3); @@ -35657,13 +38031,25 @@ static PyObject *_wrap_IndividualLayoutConstraint_SameAs(PyObject *self, PyObjec int arg4 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "otherW",(char *) "edge",(char *) "marg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|i:IndividualLayoutConstraint_SameAs",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:IndividualLayoutConstraint_SameAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (wxEdge) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SameAs(arg2,(wxEdge )arg3,arg4); @@ -35686,13 +38072,23 @@ static PyObject *_wrap_IndividualLayoutConstraint_PercentOf(PyObject *self, PyOb int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "otherW",(char *) "wh",(char *) "per", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:IndividualLayoutConstraint_PercentOf",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_PercentOf",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (wxEdge) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PercentOf(arg2,(wxEdge )arg3,arg4); @@ -35712,12 +38108,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_Absolute(PyObject *self, PyObj wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "val", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_Absolute",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_Absolute",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Absolute(arg2); @@ -35825,7 +38226,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMyEdge(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35837,12 +38238,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetEdge(PyObject *self, PyObje wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "which", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetEdge",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetEdge",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxEdge) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEdge((wxEdge )arg2); @@ -35862,12 +38268,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetValue(PyObject *self, PyObj wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -35900,7 +38311,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMargin(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35912,12 +38323,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetMargin(PyObject *self, PyOb wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetMargin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetMargin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargin(arg2); @@ -35950,7 +38366,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetValue(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -35975,7 +38391,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetPercent(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -36000,7 +38416,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetOtherEdge(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -36025,7 +38441,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -36045,7 +38461,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetDone(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetDone",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -36080,7 +38496,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetRelationship(PyObject *self wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -36092,12 +38508,17 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetRelationship(PyObject *self wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "r", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxRelationship) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRelationship((wxRelationship )arg2); @@ -36133,7 +38554,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -36164,7 +38585,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -36179,14 +38600,19 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObje wxWindow *arg4 = (wxWindow *) 0 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "which",(char *) "thisWin",(char *) "other", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO:IndividualLayoutConstraint_GetEdge",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_GetEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIndividualLayoutConstraint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxEdge) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -36196,7 +38622,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -36416,7 +38842,7 @@ static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -36445,7 +38871,7 @@ static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -38222,11 +40648,11 @@ static swig_type_info _swigt__p_wxAppTraits[] = {{"_p_wxAppTraits", 0, "wxAppTra static swig_type_info _swigt__p_wxArrayString[] = {{"_p_wxArrayString", 0, "wxArrayString *", 0},{"_p_wxArrayString"},{0}}; static swig_type_info _swigt__p_wxShowEvent[] = {{"_p_wxShowEvent", 0, "wxShowEvent *", 0},{"_p_wxShowEvent"},{0}}; static swig_type_info _swigt__p_wxToolTip[] = {{"_p_wxToolTip", 0, "wxToolTip *", 0},{"_p_wxToolTip"},{0}}; -static swig_type_info _swigt__p_wxMaximizeEvent[] = {{"_p_wxMaximizeEvent", 0, "wxMaximizeEvent *", 0},{"_p_wxMaximizeEvent"},{0}}; static swig_type_info _swigt__p_wxIconizeEvent[] = {{"_p_wxIconizeEvent", 0, "wxIconizeEvent *", 0},{"_p_wxIconizeEvent"},{0}}; static swig_type_info _swigt__p_wxActivateEvent[] = {{"_p_wxActivateEvent", 0, "wxActivateEvent *", 0},{"_p_wxActivateEvent"},{0}}; static swig_type_info _swigt__p_wxMoveEvent[] = {{"_p_wxMoveEvent", 0, "wxMoveEvent *", 0},{"_p_wxMoveEvent"},{0}}; static swig_type_info _swigt__p_wxSizeEvent[] = {{"_p_wxSizeEvent", 0, "wxSizeEvent *", 0},{"_p_wxSizeEvent"},{0}}; +static swig_type_info _swigt__p_wxMaximizeEvent[] = {{"_p_wxMaximizeEvent", 0, "wxMaximizeEvent *", 0},{"_p_wxMaximizeEvent"},{0}}; static swig_type_info _swigt__p_wxQueryNewPaletteEvent[] = {{"_p_wxQueryNewPaletteEvent", 0, "wxQueryNewPaletteEvent *", 0},{"_p_wxQueryNewPaletteEvent"},{0}}; static swig_type_info _swigt__p_wxWindowCreateEvent[] = {{"_p_wxWindowCreateEvent", 0, "wxWindowCreateEvent *", 0},{"_p_wxWindowCreateEvent"},{0}}; static swig_type_info _swigt__p_wxIdleEvent[] = {{"_p_wxIdleEvent", 0, "wxIdleEvent *", 0},{"_p_wxIdleEvent"},{0}}; @@ -38242,6 +40668,7 @@ static swig_type_info _swigt__p_wxGIFHandler[] = {{"_p_wxGIFHandler", 0, "wxGIFH static swig_type_info _swigt__p_wxPNGHandler[] = {{"_p_wxPNGHandler", 0, "wxPNGHandler *", 0},{"_p_wxPNGHandler"},{0}}; static swig_type_info _swigt__p_wxANIHandler[] = {{"_p_wxANIHandler", 0, "wxANIHandler *", 0},{"_p_wxANIHandler"},{0}}; static swig_type_info _swigt__p_wxMemoryFSHandler[] = {{"_p_wxMemoryFSHandler", 0, "wxMemoryFSHandler *", 0},{"_p_wxMemoryFSHandler"},{0}}; +static swig_type_info _swigt__p_wxZipFSHandler[] = {{"_p_wxZipFSHandler", 0, "wxZipFSHandler *", 0},{"_p_wxZipFSHandler"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxCURHandler[] = {{"_p_wxCURHandler", 0, "wxCURHandler *", 0},{"_p_wxCURHandler"},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxCURHandler},{0}}; static swig_type_info _swigt__p_wxICOHandler[] = {{"_p_wxICOHandler", 0, "wxICOHandler *", 0},{"_p_wxICOHandler"},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxICOHandler},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxICOHandler},{0}}; @@ -38250,11 +40677,11 @@ static swig_type_info _swigt__p_wxImageHandler[] = {{"_p_wxImageHandler", 0, "wx static swig_type_info _swigt__p_wxFileSystemHandler[] = {{"_p_wxFileSystemHandler", 0, "wxFileSystemHandler *", 0},{"_p_wxFileSystemHandler"},{"_p_wxPyFileSystemHandler", _p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler},{"_p_wxInternetFSHandler", _p_wxInternetFSHandlerTo_p_wxFileSystemHandler},{"_p_wxZipFSHandler", _p_wxZipFSHandlerTo_p_wxFileSystemHandler},{"_p_wxMemoryFSHandler", _p_wxMemoryFSHandlerTo_p_wxFileSystemHandler},{0}}; static swig_type_info _swigt__p_wxPyFileSystemHandler[] = {{"_p_wxPyFileSystemHandler", 0, "wxPyFileSystemHandler *", 0},{"_p_wxPyFileSystemHandler"},{0}}; static swig_type_info _swigt__p_wxInternetFSHandler[] = {{"_p_wxInternetFSHandler", 0, "wxInternetFSHandler *", 0},{"_p_wxInternetFSHandler"},{0}}; -static swig_type_info _swigt__p_wxZipFSHandler[] = {{"_p_wxZipFSHandler", 0, "wxZipFSHandler *", 0},{"_p_wxZipFSHandler"},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; static swig_type_info _swigt__p_wxGBSpan[] = {{"_p_wxGBSpan", 0, "wxGBSpan *", 0},{"_p_wxGBSpan"},{0}}; static swig_type_info _swigt__p_wxPropagateOnce[] = {{"_p_wxPropagateOnce", 0, "wxPropagateOnce *", 0},{"_p_wxPropagateOnce"},{0}}; static swig_type_info _swigt__p_wxAcceleratorTable[] = {{"_p_wxAcceleratorTable", 0, "wxAcceleratorTable *", 0},{"_p_wxAcceleratorTable"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxGBPosition[] = {{"_p_wxGBPosition", 0, "wxGBPosition *", 0},{"_p_wxGBPosition"},{0}}; static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0},{"_p_wxImage"},{0}}; static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxFrame"},{0}}; @@ -38338,11 +40765,11 @@ _swigt__p_wxAppTraits, _swigt__p_wxArrayString, _swigt__p_wxShowEvent, _swigt__p_wxToolTip, -_swigt__p_wxMaximizeEvent, _swigt__p_wxIconizeEvent, _swigt__p_wxActivateEvent, _swigt__p_wxMoveEvent, _swigt__p_wxSizeEvent, +_swigt__p_wxMaximizeEvent, _swigt__p_wxQueryNewPaletteEvent, _swigt__p_wxWindowCreateEvent, _swigt__p_wxIdleEvent, @@ -38358,6 +40785,7 @@ _swigt__p_wxGIFHandler, _swigt__p_wxPNGHandler, _swigt__p_wxANIHandler, _swigt__p_wxMemoryFSHandler, +_swigt__p_wxZipFSHandler, _swigt__p_wxEvtHandler, _swigt__p_wxCURHandler, _swigt__p_wxICOHandler, @@ -38366,11 +40794,11 @@ _swigt__p_wxImageHandler, _swigt__p_wxFileSystemHandler, _swigt__p_wxPyFileSystemHandler, _swigt__p_wxInternetFSHandler, -_swigt__p_wxZipFSHandler, _swigt__p_wxRect, _swigt__p_wxGBSpan, _swigt__p_wxPropagateOnce, _swigt__p_wxAcceleratorTable, +_swigt__p_char, _swigt__p_wxGBPosition, _swigt__p_wxImage, _swigt__p_wxFrame, @@ -38416,762 +40844,6 @@ _swigt__p_wxPyValidator, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"NOT_FOUND", (long) wxNOT_FOUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VSCROLL", (long) wxVSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HSCROLL", (long) wxHSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAPTION", (long) wxCAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOUBLE_BORDER", (long) wxDOUBLE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SUNKEN_BORDER", (long) wxSUNKEN_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RAISED_BORDER", (long) wxRAISED_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER", (long) wxBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIMPLE_BORDER", (long) wxSIMPLE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STATIC_BORDER", (long) wxSTATIC_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TRANSPARENT_WINDOW", (long) wxTRANSPARENT_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_BORDER", (long) wxNO_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"USER_COLOURS", (long) wxUSER_COLOURS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_3D", (long) wxNO_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TAB_TRAVERSAL", (long) wxTAB_TRAVERSAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WANTS_CHARS", (long) wxWANTS_CHARS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"POPUP_WINDOW", (long) wxPOPUP_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER_FRAME", (long) wxCENTER_FRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTRE_ON_SCREEN", (long) wxCENTRE_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER_ON_SCREEN", (long) wxCENTER_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STAY_ON_TOP", (long) wxSTAY_ON_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICONIZE", (long) wxICONIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MINIMIZE", (long) wxMINIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAXIMIZE", (long) wxMAXIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLOSE_BOX", (long) wxCLOSE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"THICK_FRAME", (long) wxTHICK_FRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYSTEM_MENU", (long) wxSYSTEM_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MINIMIZE_BOX", (long) wxMINIMIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAXIMIZE_BOX", (long) wxMAXIMIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TINY_CAPTION_HORIZ", (long) wxTINY_CAPTION_HORIZ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TINY_CAPTION_VERT", (long) wxTINY_CAPTION_VERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESIZE_BOX", (long) wxRESIZE_BOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESIZE_BORDER", (long) wxRESIZE_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_MODAL", (long) wxDIALOG_MODAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_MODELESS", (long) wxDIALOG_MODELESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DIALOG_NO_PARENT", (long) wxDIALOG_NO_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT_FRAME_STYLE", (long) wxDEFAULT_FRAME_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT_DIALOG_STYLE", (long) wxDEFAULT_DIALOG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_TOOL_WINDOW", (long) wxFRAME_TOOL_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_FLOAT_ON_PARENT", (long) wxFRAME_FLOAT_ON_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_NO_WINDOW_MENU", (long) wxFRAME_NO_WINDOW_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_NO_TASKBAR", (long) wxFRAME_NO_TASKBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FRAME_SHAPED", (long) wxFRAME_SHAPED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_CLIENT_MARGIN", (long) wxED_CLIENT_MARGIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_BUTTONS_BOTTOM", (long) wxED_BUTTONS_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_BUTTONS_RIGHT", (long) wxED_BUTTONS_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ED_STATIC_LINE", (long) wxED_STATIC_LINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXT_DIALOG_STYLE", (long) wxEXT_DIALOG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLIP_CHILDREN", (long) wxCLIP_CHILDREN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLIP_SIBLINGS", (long) wxCLIP_SIBLINGS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RETAINED", (long) wxRETAINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BACKINGSTORE", (long) wxBACKINGSTORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"COLOURED", (long) wxCOLOURED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIXED_LENGTH", (long) wxFIXED_LENGTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_NEEDED_SB", (long) wxLB_NEEDED_SB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_ALWAYS_SB", (long) wxLB_ALWAYS_SB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_SORT", (long) wxLB_SORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_SINGLE", (long) wxLB_SINGLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_MULTIPLE", (long) wxLB_MULTIPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_EXTENDED", (long) wxLB_EXTENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_OWNERDRAW", (long) wxLB_OWNERDRAW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LB_HSCROLL", (long) wxLB_HSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PROCESS_ENTER", (long) wxPROCESS_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PASSWORD", (long) wxPASSWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_SIMPLE", (long) wxCB_SIMPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_DROPDOWN", (long) wxCB_DROPDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_SORT", (long) wxCB_SORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CB_READONLY", (long) wxCB_READONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_HORIZONTAL", (long) wxRA_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_VERTICAL", (long) wxRA_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_SPECIFY_ROWS", (long) wxRA_SPECIFY_ROWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RA_SPECIFY_COLS", (long) wxRA_SPECIFY_COLS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RB_GROUP", (long) wxRB_GROUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RB_SINGLE", (long) wxRB_SINGLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_HORIZONTAL", (long) wxSL_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_VERTICAL", (long) wxSL_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_AUTOTICKS", (long) wxSL_AUTOTICKS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_LABELS", (long) wxSL_LABELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_LEFT", (long) wxSL_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_TOP", (long) wxSL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_RIGHT", (long) wxSL_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_BOTTOM", (long) wxSL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_BOTH", (long) wxSL_BOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SL_SELRANGE", (long) wxSL_SELRANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SB_HORIZONTAL", (long) wxSB_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SB_VERTICAL", (long) wxSB_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ST_SIZEGRIP", (long) wxST_SIZEGRIP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ST_NO_AUTORESIZE", (long) wxST_NO_AUTORESIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLOOD_SURFACE", (long) wxFLOOD_SURFACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLOOD_BORDER", (long) wxFLOOD_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ODDEVEN_RULE", (long) wxODDEVEN_RULE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WINDING_RULE", (long) wxWINDING_RULE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_TOP", (long) wxTOOL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_BOTTOM", (long) wxTOOL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_LEFT", (long) wxTOOL_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOOL_RIGHT", (long) wxTOOL_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OK", (long) wxOK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES_NO", (long) wxYES_NO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CANCEL", (long) wxCANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES", (long) wxYES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO", (long) wxNO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_DEFAULT", (long) wxNO_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"YES_DEFAULT", (long) wxYES_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_EXCLAMATION", (long) wxICON_EXCLAMATION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_HAND", (long) wxICON_HAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_QUESTION", (long) wxICON_QUESTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_INFORMATION", (long) wxICON_INFORMATION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_STOP", (long) wxICON_STOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_ASTERISK", (long) wxICON_ASTERISK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_MASK", (long) wxICON_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_WARNING", (long) wxICON_WARNING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ICON_ERROR", (long) wxICON_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FORWARD", (long) wxFORWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BACKWARD", (long) wxBACKWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RESET", (long) wxRESET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HELP", (long) wxHELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MORE", (long) wxMORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SETUP", (long) wxSETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO_WIDTH", (long) wxSIZE_AUTO_WIDTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO_HEIGHT", (long) wxSIZE_AUTO_HEIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_AUTO", (long) wxSIZE_AUTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_USE_EXISTING", (long) wxSIZE_USE_EXISTING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIZE_ALLOW_MINUS_ONE", (long) wxSIZE_ALLOW_MINUS_ONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PORTRAIT", (long) wxPORTRAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANDSCAPE", (long) wxLANDSCAPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_HIGH", (long) wxPRINT_QUALITY_HIGH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_MEDIUM", (long) wxPRINT_QUALITY_MEDIUM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_LOW", (long) wxPRINT_QUALITY_LOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_QUALITY_DRAFT", (long) wxPRINT_QUALITY_DRAFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ANY", (long) wxID_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SEPARATOR", (long) wxID_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_LOWEST", (long) wxID_LOWEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_OPEN", (long) wxID_OPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLOSE", (long) wxID_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NEW", (long) wxID_NEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SAVE", (long) wxID_SAVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SAVEAS", (long) wxID_SAVEAS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REVERT", (long) wxID_REVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_EXIT", (long) wxID_EXIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_UNDO", (long) wxID_UNDO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REDO", (long) wxID_REDO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP", (long) wxID_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PRINT", (long) wxID_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PRINT_SETUP", (long) wxID_PRINT_SETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW", (long) wxID_PREVIEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ABOUT", (long) wxID_ABOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_CONTENTS", (long) wxID_HELP_CONTENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_COMMANDS", (long) wxID_HELP_COMMANDS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_PROCEDURES", (long) wxID_HELP_PROCEDURES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HELP_CONTEXT", (long) wxID_HELP_CONTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLOSE_ALL", (long) wxID_CLOSE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREFERENCES", (long) wxID_PREFERENCES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CUT", (long) wxID_CUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_COPY", (long) wxID_COPY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PASTE", (long) wxID_PASTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CLEAR", (long) wxID_CLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FIND", (long) wxID_FIND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DUPLICATE", (long) wxID_DUPLICATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SELECTALL", (long) wxID_SELECTALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DELETE", (long) wxID_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REPLACE", (long) wxID_REPLACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_REPLACE_ALL", (long) wxID_REPLACE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PROPERTIES", (long) wxID_PROPERTIES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_DETAILS", (long) wxID_VIEW_DETAILS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_LARGEICONS", (long) wxID_VIEW_LARGEICONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SMALLICONS", (long) wxID_VIEW_SMALLICONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_LIST", (long) wxID_VIEW_LIST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTDATE", (long) wxID_VIEW_SORTDATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTNAME", (long) wxID_VIEW_SORTNAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTSIZE", (long) wxID_VIEW_SORTSIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_VIEW_SORTTYPE", (long) wxID_VIEW_SORTTYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE1", (long) wxID_FILE1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE2", (long) wxID_FILE2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE3", (long) wxID_FILE3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE4", (long) wxID_FILE4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE5", (long) wxID_FILE5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE6", (long) wxID_FILE6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE7", (long) wxID_FILE7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE8", (long) wxID_FILE8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FILE9", (long) wxID_FILE9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_OK", (long) wxID_OK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CANCEL", (long) wxID_CANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_APPLY", (long) wxID_APPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_YES", (long) wxID_YES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NO", (long) wxID_NO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_STATIC", (long) wxID_STATIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_FORWARD", (long) wxID_FORWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_BACKWARD", (long) wxID_BACKWARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_DEFAULT", (long) wxID_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_MORE", (long) wxID_MORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_SETUP", (long) wxID_SETUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_RESET", (long) wxID_RESET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_CONTEXT_HELP", (long) wxID_CONTEXT_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_YESTOALL", (long) wxID_YESTOALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_NOTOALL", (long) wxID_NOTOALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_ABORT", (long) wxID_ABORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_RETRY", (long) wxID_RETRY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_IGNORE", (long) wxID_IGNORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_HIGHEST", (long) wxID_HIGHEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OPEN", (long) wxOPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SAVE", (long) wxSAVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HIDE_READONLY", (long) wxHIDE_READONLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OVERWRITE_PROMPT", (long) wxOVERWRITE_PROMPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FILE_MUST_EXIST", (long) wxFILE_MUST_EXIST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MULTIPLE", (long) wxMULTIPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHANGE_DIR", (long) wxCHANGE_DIR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_ALT", (long) wxACCEL_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_CTRL", (long) wxACCEL_CTRL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_SHIFT", (long) wxACCEL_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ACCEL_NORMAL", (long) wxACCEL_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_AUTO_HIDE", (long) wxPD_AUTO_HIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_APP_MODAL", (long) wxPD_APP_MODAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_CAN_ABORT", (long) wxPD_CAN_ABORT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_ELAPSED_TIME", (long) wxPD_ELAPSED_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_ESTIMATED_TIME", (long) wxPD_ESTIMATED_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PD_REMAINING_TIME", (long) wxPD_REMAINING_TIME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DD_NEW_DIR_BUTTON", (long) wxDD_NEW_DIR_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DD_DEFAULT_STYLE", (long) wxDD_DEFAULT_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MENU_TEAROFF", (long) wxMENU_TEAROFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MB_DOCKABLE", (long) wxMB_DOCKABLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_FULL_REPAINT_ON_RESIZE", (long) wxNO_FULL_REPAINT_ON_RESIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULL_REPAINT_ON_RESIZE", (long) wxFULL_REPAINT_ON_RESIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LI_HORIZONTAL", (long) wxLI_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LI_VERTICAL", (long) wxLI_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_VALIDATE_RECURSIVELY", (long) wxWS_EX_VALIDATE_RECURSIVELY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_BLOCK_EVENTS", (long) wxWS_EX_BLOCK_EVENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_TRANSIENT", (long) wxWS_EX_TRANSIENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_THEMED_BACKGROUND", (long) wxWS_EX_THEMED_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_PROCESS_IDLE", (long) wxWS_EX_PROCESS_IDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WS_EX_PROCESS_UI_UPDATES", (long) wxWS_EX_PROCESS_UI_UPDATES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_TEXT", (long) wxMM_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_LOMETRIC", (long) wxMM_LOMETRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_HIMETRIC", (long) wxMM_HIMETRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_LOENGLISH", (long) wxMM_LOENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_HIENGLISH", (long) wxMM_HIENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_TWIPS", (long) wxMM_TWIPS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_ISOTROPIC", (long) wxMM_ISOTROPIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_ANISOTROPIC", (long) wxMM_ANISOTROPIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_POINTS", (long) wxMM_POINTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MM_METRIC", (long) wxMM_METRIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTRE", (long) wxCENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CENTER", (long) wxCENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HORIZONTAL", (long) wxHORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VERTICAL", (long) wxVERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOTH", (long) wxBOTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LEFT", (long) wxLEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RIGHT", (long) wxRIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UP", (long) wxUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOWN", (long) wxDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOP", (long) wxTOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOTTOM", (long) wxBOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NORTH", (long) wxNORTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SOUTH", (long) wxSOUTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WEST", (long) wxWEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EAST", (long) wxEAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALL", (long) wxALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_NOT", (long) wxALIGN_NOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER_HORIZONTAL", (long) wxALIGN_CENTER_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE_HORIZONTAL", (long) wxALIGN_CENTRE_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_LEFT", (long) wxALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_TOP", (long) wxALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_RIGHT", (long) wxALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_BOTTOM", (long) wxALIGN_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER_VERTICAL", (long) wxALIGN_CENTER_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE_VERTICAL", (long) wxALIGN_CENTRE_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTER", (long) wxALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_CENTRE", (long) wxALIGN_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ALIGN_MASK", (long) wxALIGN_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STRETCH_NOT", (long) wxSTRETCH_NOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHRINK", (long) wxSHRINK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GROW", (long) wxGROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXPAND", (long) wxEXPAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHAPED", (long) wxSHAPED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ADJUST_MINSIZE", (long) wxADJUST_MINSIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TILE", (long) wxTILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_DEFAULT", (long) wxBORDER_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_NONE", (long) wxBORDER_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_STATIC", (long) wxBORDER_STATIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_SIMPLE", (long) wxBORDER_SIMPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_RAISED", (long) wxBORDER_RAISED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_SUNKEN", (long) wxBORDER_SUNKEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_DOUBLE", (long) wxBORDER_DOUBLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BORDER_MASK", (long) wxBORDER_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DEFAULT", (long) wxDEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DECORATIVE", (long) wxDECORATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ROMAN", (long) wxROMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SCRIPT", (long) wxSCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SWISS", (long) wxSWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MODERN", (long) wxMODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TELETYPE", (long) wxTELETYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VARIABLE", (long) wxVARIABLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIXED", (long) wxFIXED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NORMAL", (long) wxNORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LIGHT", (long) wxLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BOLD", (long) wxBOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITALIC", (long) wxITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SLANT", (long) wxSLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SOLID", (long) wxSOLID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOT", (long) wxDOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LONG_DASH", (long) wxLONG_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHORT_DASH", (long) wxSHORT_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DOT_DASH", (long) wxDOT_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"USER_DASH", (long) wxUSER_DASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TRANSPARENT", (long) wxTRANSPARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"STIPPLE", (long) wxSTIPPLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BDIAGONAL_HATCH", (long) wxBDIAGONAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CROSSDIAG_HATCH", (long) wxCROSSDIAG_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FDIAGONAL_HATCH", (long) wxFDIAGONAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CROSS_HATCH", (long) wxCROSS_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HORIZONTAL_HATCH", (long) wxHORIZONTAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"VERTICAL_HATCH", (long) wxVERTICAL_HATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_BEVEL", (long) wxJOIN_BEVEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_MITER", (long) wxJOIN_MITER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOIN_ROUND", (long) wxJOIN_ROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_ROUND", (long) wxCAP_ROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_PROJECTING", (long) wxCAP_PROJECTING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CAP_BUTT", (long) wxCAP_BUTT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CLEAR", (long) wxCLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"XOR", (long) wxXOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"INVERT", (long) wxINVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR_REVERSE", (long) wxOR_REVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND_REVERSE", (long) wxAND_REVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"COPY", (long) wxCOPY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND", (long) wxAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AND_INVERT", (long) wxAND_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NO_OP", (long) wxNO_OP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NOR", (long) wxNOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EQUIV", (long) wxEQUIV, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SRC_INVERT", (long) wxSRC_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR_INVERT", (long) wxOR_INVERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"NAND", (long) wxNAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"OR", (long) wxOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SET", (long) wxSET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_BACK", (long) WXK_BACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_TAB", (long) WXK_TAB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RETURN", (long) WXK_RETURN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ESCAPE", (long) WXK_ESCAPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SPACE", (long) WXK_SPACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DELETE", (long) WXK_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_START", (long) WXK_START, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_LBUTTON", (long) WXK_LBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RBUTTON", (long) WXK_RBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CANCEL", (long) WXK_CANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MBUTTON", (long) WXK_MBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CLEAR", (long) WXK_CLEAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SHIFT", (long) WXK_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ALT", (long) WXK_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CONTROL", (long) WXK_CONTROL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MENU", (long) WXK_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAUSE", (long) WXK_PAUSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_CAPITAL", (long) WXK_CAPITAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PRIOR", (long) WXK_PRIOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NEXT", (long) WXK_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_END", (long) WXK_END, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_HOME", (long) WXK_HOME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_LEFT", (long) WXK_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_UP", (long) WXK_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_RIGHT", (long) WXK_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DOWN", (long) WXK_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SELECT", (long) WXK_SELECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PRINT", (long) WXK_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_EXECUTE", (long) WXK_EXECUTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SNAPSHOT", (long) WXK_SNAPSHOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_INSERT", (long) WXK_INSERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_HELP", (long) WXK_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD0", (long) WXK_NUMPAD0, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD1", (long) WXK_NUMPAD1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD2", (long) WXK_NUMPAD2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD3", (long) WXK_NUMPAD3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD4", (long) WXK_NUMPAD4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD5", (long) WXK_NUMPAD5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD6", (long) WXK_NUMPAD6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD7", (long) WXK_NUMPAD7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD8", (long) WXK_NUMPAD8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD9", (long) WXK_NUMPAD9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_MULTIPLY", (long) WXK_MULTIPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_ADD", (long) WXK_ADD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SEPARATOR", (long) WXK_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SUBTRACT", (long) WXK_SUBTRACT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DECIMAL", (long) WXK_DECIMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_DIVIDE", (long) WXK_DIVIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F1", (long) WXK_F1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F2", (long) WXK_F2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F3", (long) WXK_F3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F4", (long) WXK_F4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F5", (long) WXK_F5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F6", (long) WXK_F6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F7", (long) WXK_F7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F8", (long) WXK_F8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F9", (long) WXK_F9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F10", (long) WXK_F10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F11", (long) WXK_F11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F12", (long) WXK_F12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F13", (long) WXK_F13, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F14", (long) WXK_F14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F15", (long) WXK_F15, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F16", (long) WXK_F16, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F17", (long) WXK_F17, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F18", (long) WXK_F18, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F19", (long) WXK_F19, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F20", (long) WXK_F20, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F21", (long) WXK_F21, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F22", (long) WXK_F22, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F23", (long) WXK_F23, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_F24", (long) WXK_F24, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMLOCK", (long) WXK_NUMLOCK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_SCROLL", (long) WXK_SCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAGEUP", (long) WXK_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_PAGEDOWN", (long) WXK_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SPACE", (long) WXK_NUMPAD_SPACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_TAB", (long) WXK_NUMPAD_TAB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_ENTER", (long) WXK_NUMPAD_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F1", (long) WXK_NUMPAD_F1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F2", (long) WXK_NUMPAD_F2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F3", (long) WXK_NUMPAD_F3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_F4", (long) WXK_NUMPAD_F4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_HOME", (long) WXK_NUMPAD_HOME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_LEFT", (long) WXK_NUMPAD_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_UP", (long) WXK_NUMPAD_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_RIGHT", (long) WXK_NUMPAD_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DOWN", (long) WXK_NUMPAD_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PRIOR", (long) WXK_NUMPAD_PRIOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PAGEUP", (long) WXK_NUMPAD_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_NEXT", (long) WXK_NUMPAD_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_PAGEDOWN", (long) WXK_NUMPAD_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_END", (long) WXK_NUMPAD_END, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_BEGIN", (long) WXK_NUMPAD_BEGIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_INSERT", (long) WXK_NUMPAD_INSERT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DELETE", (long) WXK_NUMPAD_DELETE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_EQUAL", (long) WXK_NUMPAD_EQUAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_MULTIPLY", (long) WXK_NUMPAD_MULTIPLY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_ADD", (long) WXK_NUMPAD_ADD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SEPARATOR", (long) WXK_NUMPAD_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_SUBTRACT", (long) WXK_NUMPAD_SUBTRACT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DECIMAL", (long) WXK_NUMPAD_DECIMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_NUMPAD_DIVIDE", (long) WXK_NUMPAD_DIVIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_LEFT", (long) WXK_WINDOWS_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_RIGHT", (long) WXK_WINDOWS_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"WXK_WINDOWS_MENU", (long) WXK_WINDOWS_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_NONE", (long) wxPAPER_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER", (long) wxPAPER_LETTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEGAL", (long) wxPAPER_LEGAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4", (long) wxPAPER_A4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_CSHEET", (long) wxPAPER_CSHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_DSHEET", (long) wxPAPER_DSHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ESHEET", (long) wxPAPER_ESHEET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTERSMALL", (long) wxPAPER_LETTERSMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_TABLOID", (long) wxPAPER_TABLOID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEDGER", (long) wxPAPER_LEDGER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_STATEMENT", (long) wxPAPER_STATEMENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_EXECUTIVE", (long) wxPAPER_EXECUTIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3", (long) wxPAPER_A3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4SMALL", (long) wxPAPER_A4SMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5", (long) wxPAPER_A5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B4", (long) wxPAPER_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5", (long) wxPAPER_B5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FOLIO", (long) wxPAPER_FOLIO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_QUARTO", (long) wxPAPER_QUARTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_10X14", (long) wxPAPER_10X14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_11X17", (long) wxPAPER_11X17, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_NOTE", (long) wxPAPER_NOTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_9", (long) wxPAPER_ENV_9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_10", (long) wxPAPER_ENV_10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_11", (long) wxPAPER_ENV_11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_12", (long) wxPAPER_ENV_12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_14", (long) wxPAPER_ENV_14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_DL", (long) wxPAPER_ENV_DL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C5", (long) wxPAPER_ENV_C5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C3", (long) wxPAPER_ENV_C3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C4", (long) wxPAPER_ENV_C4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C6", (long) wxPAPER_ENV_C6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_C65", (long) wxPAPER_ENV_C65, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B4", (long) wxPAPER_ENV_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B5", (long) wxPAPER_ENV_B5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_B6", (long) wxPAPER_ENV_B6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_ITALY", (long) wxPAPER_ENV_ITALY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_MONARCH", (long) wxPAPER_ENV_MONARCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_PERSONAL", (long) wxPAPER_ENV_PERSONAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_US", (long) wxPAPER_FANFOLD_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_STD_GERMAN", (long) wxPAPER_FANFOLD_STD_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_FANFOLD_LGL_GERMAN", (long) wxPAPER_FANFOLD_LGL_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ISO_B4", (long) wxPAPER_ISO_B4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_JAPANESE_POSTCARD", (long) wxPAPER_JAPANESE_POSTCARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_9X11", (long) wxPAPER_9X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_10X11", (long) wxPAPER_10X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_15X11", (long) wxPAPER_15X11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_ENV_INVITE", (long) wxPAPER_ENV_INVITE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_EXTRA", (long) wxPAPER_LETTER_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LEGAL_EXTRA", (long) wxPAPER_LEGAL_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_TABLOID_EXTRA", (long) wxPAPER_TABLOID_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_EXTRA", (long) wxPAPER_A4_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_TRANSVERSE", (long) wxPAPER_LETTER_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_TRANSVERSE", (long) wxPAPER_A4_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_EXTRA_TRANSVERSE", (long) wxPAPER_LETTER_EXTRA_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A_PLUS", (long) wxPAPER_A_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B_PLUS", (long) wxPAPER_B_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_LETTER_PLUS", (long) wxPAPER_LETTER_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A4_PLUS", (long) wxPAPER_A4_PLUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5_TRANSVERSE", (long) wxPAPER_A5_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5_TRANSVERSE", (long) wxPAPER_B5_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_EXTRA", (long) wxPAPER_A3_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A5_EXTRA", (long) wxPAPER_A5_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_B5_EXTRA", (long) wxPAPER_B5_EXTRA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A2", (long) wxPAPER_A2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_TRANSVERSE", (long) wxPAPER_A3_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAPER_A3_EXTRA_TRANSVERSE", (long) wxPAPER_A3_EXTRA_TRANSVERSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_SIMPLEX", (long) wxDUPLEX_SIMPLEX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_HORIZONTAL", (long) wxDUPLEX_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DUPLEX_VERTICAL", (long) wxDUPLEX_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_SEPARATOR", (long) wxITEM_SEPARATOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_NORMAL", (long) wxITEM_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_CHECK", (long) wxITEM_CHECK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_RADIO", (long) wxITEM_RADIO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ITEM_MAX", (long) wxITEM_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_NOWHERE", (long) wxHT_NOWHERE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_FIRST", (long) wxHT_SCROLLBAR_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_LINE_1", (long) wxHT_SCROLLBAR_ARROW_LINE_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_LINE_2", (long) wxHT_SCROLLBAR_ARROW_LINE_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_PAGE_1", (long) wxHT_SCROLLBAR_ARROW_PAGE_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_ARROW_PAGE_2", (long) wxHT_SCROLLBAR_ARROW_PAGE_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_THUMB", (long) wxHT_SCROLLBAR_THUMB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_BAR_1", (long) wxHT_SCROLLBAR_BAR_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_BAR_2", (long) wxHT_SCROLLBAR_BAR_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_SCROLLBAR_LAST", (long) wxHT_SCROLLBAR_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_OUTSIDE", (long) wxHT_WINDOW_OUTSIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_INSIDE", (long) wxHT_WINDOW_INSIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_VERT_SCROLLBAR", (long) wxHT_WINDOW_VERT_SCROLLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_HORZ_SCROLLBAR", (long) wxHT_WINDOW_HORZ_SCROLLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_WINDOW_CORNER", (long) wxHT_WINDOW_CORNER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HT_MAX", (long) wxHT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_NONE", (long) wxMOD_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_ALT", (long) wxMOD_ALT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_CONTROL", (long) wxMOD_CONTROL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_SHIFT", (long) wxMOD_SHIFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOD_WIN", (long) wxMOD_WIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_NONE", (long) wxUPDATE_UI_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_RECURSE", (long) wxUPDATE_UI_RECURSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_FROMIDLE", (long) wxUPDATE_UI_FROMIDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_INVALID", (long) wxBITMAP_TYPE_INVALID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP", (long) wxBITMAP_TYPE_BMP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO", (long) wxBITMAP_TYPE_ICO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR", (long) wxBITMAP_TYPE_CUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM", (long) wxBITMAP_TYPE_XBM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM_DATA", (long) wxBITMAP_TYPE_XBM_DATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM", (long) wxBITMAP_TYPE_XPM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM_DATA", (long) wxBITMAP_TYPE_XPM_DATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF", (long) wxBITMAP_TYPE_TIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF", (long) wxBITMAP_TYPE_GIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG", (long) wxBITMAP_TYPE_PNG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG", (long) wxBITMAP_TYPE_JPEG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM", (long) wxBITMAP_TYPE_PNM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX", (long) wxBITMAP_TYPE_PCX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT", (long) wxBITMAP_TYPE_PICT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON", (long) wxBITMAP_TYPE_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ANI", (long) wxBITMAP_TYPE_ANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_IFF", (long) wxBITMAP_TYPE_IFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR", (long) wxBITMAP_TYPE_MACCURSOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ANY", (long) wxBITMAP_TYPE_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_NONE", (long) wxCURSOR_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_ARROW", (long) wxCURSOR_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_RIGHT_ARROW", (long) wxCURSOR_RIGHT_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_BULLSEYE", (long) wxCURSOR_BULLSEYE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_CHAR", (long) wxCURSOR_CHAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_CROSS", (long) wxCURSOR_CROSS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_HAND", (long) wxCURSOR_HAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_IBEAM", (long) wxCURSOR_IBEAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_LEFT_BUTTON", (long) wxCURSOR_LEFT_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MAGNIFIER", (long) wxCURSOR_MAGNIFIER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MIDDLE_BUTTON", (long) wxCURSOR_MIDDLE_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_NO_ENTRY", (long) wxCURSOR_NO_ENTRY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_PAINT_BRUSH", (long) wxCURSOR_PAINT_BRUSH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_PENCIL", (long) wxCURSOR_PENCIL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_POINT_LEFT", (long) wxCURSOR_POINT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_POINT_RIGHT", (long) wxCURSOR_POINT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_QUESTION_ARROW", (long) wxCURSOR_QUESTION_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_RIGHT_BUTTON", (long) wxCURSOR_RIGHT_BUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENESW", (long) wxCURSOR_SIZENESW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENS", (long) wxCURSOR_SIZENS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZENWSE", (long) wxCURSOR_SIZENWSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZEWE", (long) wxCURSOR_SIZEWE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SIZING", (long) wxCURSOR_SIZING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_SPRAYCAN", (long) wxCURSOR_SPRAYCAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_WAIT", (long) wxCURSOR_WAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_WATCH", (long) wxCURSOR_WATCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_BLANK", (long) wxCURSOR_BLANK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_DEFAULT", (long) wxCURSOR_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_COPY_ARROW", (long) wxCURSOR_COPY_ARROW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_ARROWWAIT", (long) wxCURSOR_ARROWWAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CURSOR_MAX", (long) wxCURSOR_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromStart", (long) wxFromStart, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromCurrent", (long) wxFromCurrent, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FromEnd", (long) wxFromEnd, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_RESOLUTION_INCHES", (long) wxIMAGE_RESOLUTION_INCHES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_RESOLUTION_CM", (long) wxIMAGE_RESOLUTION_CM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_24BPP", (long) wxBMP_24BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP", (long) wxBMP_8BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_GREY", (long) wxBMP_8BPP_GREY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_GRAY", (long) wxBMP_8BPP_GRAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_RED", (long) wxBMP_8BPP_RED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_8BPP_PALETTE", (long) wxBMP_8BPP_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_4BPP", (long) wxBMP_4BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_1BPP", (long) wxBMP_1BPP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BMP_1BPP_BW", (long) wxBMP_1BPP_BW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EVENT_PROPAGATE_NONE", (long) wxEVENT_PROPAGATE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EVENT_PROPAGATE_MAX", (long) wxEVENT_PROPAGATE_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NULL", (long) wxEVT_NULL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_FIRST", (long) wxEVT_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_USER_FIRST", (long) wxEVT_USER_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_BUTTON_CLICKED", (long) wxEVT_COMMAND_BUTTON_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHECKBOX_CLICKED", (long) wxEVT_COMMAND_CHECKBOX_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHOICE_SELECTED", (long) wxEVT_COMMAND_CHOICE_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOX_SELECTED", (long) wxEVT_COMMAND_LISTBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LISTBOX_DOUBLECLICKED", (long) wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_CHECKLISTBOX_TOGGLED", (long) wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_MENU_SELECTED", (long) wxEVT_COMMAND_MENU_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_CLICKED", (long) wxEVT_COMMAND_TOOL_CLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SLIDER_UPDATED", (long) wxEVT_COMMAND_SLIDER_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RADIOBOX_SELECTED", (long) wxEVT_COMMAND_RADIOBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RADIOBUTTON_SELECTED", (long) wxEVT_COMMAND_RADIOBUTTON_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SCROLLBAR_UPDATED", (long) wxEVT_COMMAND_SCROLLBAR_UPDATED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_VLBOX_SELECTED", (long) wxEVT_COMMAND_VLBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_COMBOBOX_SELECTED", (long) wxEVT_COMMAND_COMBOBOX_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_RCLICKED", (long) wxEVT_COMMAND_TOOL_RCLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_TOOL_ENTER", (long) wxEVT_COMMAND_TOOL_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_DOWN", (long) wxEVT_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_UP", (long) wxEVT_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_DOWN", (long) wxEVT_MIDDLE_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_UP", (long) wxEVT_MIDDLE_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_DOWN", (long) wxEVT_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_UP", (long) wxEVT_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOTION", (long) wxEVT_MOTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ENTER_WINDOW", (long) wxEVT_ENTER_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEAVE_WINDOW", (long) wxEVT_LEAVE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_LEFT_DCLICK", (long) wxEVT_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MIDDLE_DCLICK", (long) wxEVT_MIDDLE_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_RIGHT_DCLICK", (long) wxEVT_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SET_FOCUS", (long) wxEVT_SET_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KILL_FOCUS", (long) wxEVT_KILL_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHILD_FOCUS", (long) wxEVT_CHILD_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOUSEWHEEL", (long) wxEVT_MOUSEWHEEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_DOWN", (long) wxEVT_NC_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_UP", (long) wxEVT_NC_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_DOWN", (long) wxEVT_NC_MIDDLE_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_UP", (long) wxEVT_NC_MIDDLE_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_DOWN", (long) wxEVT_NC_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_UP", (long) wxEVT_NC_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MOTION", (long) wxEVT_NC_MOTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_ENTER_WINDOW", (long) wxEVT_NC_ENTER_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEAVE_WINDOW", (long) wxEVT_NC_LEAVE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_LEFT_DCLICK", (long) wxEVT_NC_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_MIDDLE_DCLICK", (long) wxEVT_NC_MIDDLE_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_RIGHT_DCLICK", (long) wxEVT_NC_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHAR", (long) wxEVT_CHAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CHAR_HOOK", (long) wxEVT_CHAR_HOOK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NAVIGATION_KEY", (long) wxEVT_NAVIGATION_KEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KEY_DOWN", (long) wxEVT_KEY_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_KEY_UP", (long) wxEVT_KEY_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_HOTKEY", (long) wxEVT_HOTKEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SET_CURSOR", (long) wxEVT_SET_CURSOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_TOP", (long) wxEVT_SCROLL_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_BOTTOM", (long) wxEVT_SCROLL_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_LINEUP", (long) wxEVT_SCROLL_LINEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_LINEDOWN", (long) wxEVT_SCROLL_LINEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_PAGEUP", (long) wxEVT_SCROLL_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_PAGEDOWN", (long) wxEVT_SCROLL_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_THUMBTRACK", (long) wxEVT_SCROLL_THUMBTRACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_THUMBRELEASE", (long) wxEVT_SCROLL_THUMBRELEASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLL_ENDSCROLL", (long) wxEVT_SCROLL_ENDSCROLL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_TOP", (long) wxEVT_SCROLLWIN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_BOTTOM", (long) wxEVT_SCROLLWIN_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_LINEUP", (long) wxEVT_SCROLLWIN_LINEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_LINEDOWN", (long) wxEVT_SCROLLWIN_LINEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_PAGEUP", (long) wxEVT_SCROLLWIN_PAGEUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_PAGEDOWN", (long) wxEVT_SCROLLWIN_PAGEDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_THUMBTRACK", (long) wxEVT_SCROLLWIN_THUMBTRACK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SCROLLWIN_THUMBRELEASE", (long) wxEVT_SCROLLWIN_THUMBRELEASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SIZE", (long) wxEVT_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOVE", (long) wxEVT_MOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CLOSE_WINDOW", (long) wxEVT_CLOSE_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_END_SESSION", (long) wxEVT_END_SESSION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_END_SESSION", (long) wxEVT_QUERY_END_SESSION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ACTIVATE_APP", (long) wxEVT_ACTIVATE_APP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_POWER", (long) wxEVT_POWER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ACTIVATE", (long) wxEVT_ACTIVATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CREATE", (long) wxEVT_CREATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DESTROY", (long) wxEVT_DESTROY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SHOW", (long) wxEVT_SHOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ICONIZE", (long) wxEVT_ICONIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MAXIMIZE", (long) wxEVT_MAXIMIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOUSE_CAPTURE_CHANGED", (long) wxEVT_MOUSE_CAPTURE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PAINT", (long) wxEVT_PAINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_ERASE_BACKGROUND", (long) wxEVT_ERASE_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_NC_PAINT", (long) wxEVT_NC_PAINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PAINT_ICON", (long) wxEVT_PAINT_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_OPEN", (long) wxEVT_MENU_OPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_CLOSE", (long) wxEVT_MENU_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MENU_HIGHLIGHT", (long) wxEVT_MENU_HIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CONTEXT_MENU", (long) wxEVT_CONTEXT_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SYS_COLOUR_CHANGED", (long) wxEVT_SYS_COLOUR_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DISPLAY_CHANGED", (long) wxEVT_DISPLAY_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SETTING_CHANGED", (long) wxEVT_SETTING_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_NEW_PALETTE", (long) wxEVT_QUERY_NEW_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_PALETTE_CHANGED", (long) wxEVT_PALETTE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DROP_FILES", (long) wxEVT_DROP_FILES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_DRAW_ITEM", (long) wxEVT_DRAW_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MEASURE_ITEM", (long) wxEVT_MEASURE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMPARE_ITEM", (long) wxEVT_COMPARE_ITEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_INIT_DIALOG", (long) wxEVT_INIT_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_IDLE", (long) wxEVT_IDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_UPDATE_UI", (long) wxEVT_UPDATE_UI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SIZING", (long) wxEVT_SIZING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_MOVING", (long) wxEVT_MOVING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LEFT_CLICK", (long) wxEVT_COMMAND_LEFT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_LEFT_DCLICK", (long) wxEVT_COMMAND_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RIGHT_CLICK", (long) wxEVT_COMMAND_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_RIGHT_DCLICK", (long) wxEVT_COMMAND_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SET_FOCUS", (long) wxEVT_COMMAND_SET_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_KILL_FOCUS", (long) wxEVT_COMMAND_KILL_FOCUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_ENTER", (long) wxEVT_COMMAND_ENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_ANY", (long) wxMOUSE_BTN_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_NONE", (long) wxMOUSE_BTN_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_LEFT", (long) wxMOUSE_BTN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_MIDDLE", (long) wxMOUSE_BTN_MIDDLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MOUSE_BTN_RIGHT", (long) wxMOUSE_BTN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_PROCESS_ALL", (long) wxUPDATE_UI_PROCESS_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"UPDATE_UI_PROCESS_SPECIFIED", (long) wxUPDATE_UI_PROCESS_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDLE_PROCESS_ALL", (long) wxIDLE_PROCESS_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDLE_PROCESS_SPECIFIED", (long) wxIDLE_PROCESS_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_SUPPRESS", (long) wxPYAPP_ASSERT_SUPPRESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_EXCEPTION", (long) wxPYAPP_ASSERT_EXCEPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_DIALOG", (long) wxPYAPP_ASSERT_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PYAPP_ASSERT_LOG", (long) wxPYAPP_ASSERT_LOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_WINDOWS", (long) wxPRINT_WINDOWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_POSTSCRIPT", (long) wxPRINT_POSTSCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_NONE", (long) wxFLEX_GROWMODE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_SPECIFIED", (long) wxFLEX_GROWMODE_SPECIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FLEX_GROWMODE_ALL", (long) wxFLEX_GROWMODE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Left", (long) wxLeft, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Top", (long) wxTop, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Right", (long) wxRight, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Bottom", (long) wxBottom, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Width", (long) wxWidth, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Height", (long) wxHeight, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Centre", (long) wxCentre, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Center", (long) wxCenter, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CentreX", (long) wxCentreX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CentreY", (long) wxCentreY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Unconstrained", (long) wxUnconstrained, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"AsIs", (long) wxAsIs, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PercentOf", (long) wxPercentOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Above", (long) wxAbove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Below", (long) wxBelow, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LeftOf", (long) wxLeftOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"RightOf", (long) wxRightOf, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SameAs", (long) wxSameAs, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Absolute", (long) wxAbsolute, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -39207,10 +40879,602 @@ SWIGEXPORT(void) SWIG_init(void) { Py_XDECREF(cobj); #endif + PyDict_SetItemString(d,"NOT_FOUND", SWIG_PyObj_FromInt((int)wxNOT_FOUND)); + PyDict_SetItemString(d,"VSCROLL", SWIG_PyObj_FromInt((int)wxVSCROLL)); + PyDict_SetItemString(d,"HSCROLL", SWIG_PyObj_FromInt((int)wxHSCROLL)); + PyDict_SetItemString(d,"CAPTION", SWIG_PyObj_FromInt((int)wxCAPTION)); + PyDict_SetItemString(d,"DOUBLE_BORDER", SWIG_PyObj_FromInt((int)wxDOUBLE_BORDER)); + PyDict_SetItemString(d,"SUNKEN_BORDER", SWIG_PyObj_FromInt((int)wxSUNKEN_BORDER)); + PyDict_SetItemString(d,"RAISED_BORDER", SWIG_PyObj_FromInt((int)wxRAISED_BORDER)); + PyDict_SetItemString(d,"BORDER", SWIG_PyObj_FromInt((int)wxBORDER)); + PyDict_SetItemString(d,"SIMPLE_BORDER", SWIG_PyObj_FromInt((int)wxSIMPLE_BORDER)); + PyDict_SetItemString(d,"STATIC_BORDER", SWIG_PyObj_FromInt((int)wxSTATIC_BORDER)); + PyDict_SetItemString(d,"TRANSPARENT_WINDOW", SWIG_PyObj_FromInt((int)wxTRANSPARENT_WINDOW)); + PyDict_SetItemString(d,"NO_BORDER", SWIG_PyObj_FromInt((int)wxNO_BORDER)); + PyDict_SetItemString(d,"USER_COLOURS", SWIG_PyObj_FromInt((int)wxUSER_COLOURS)); + PyDict_SetItemString(d,"NO_3D", SWIG_PyObj_FromInt((int)wxNO_3D)); + PyDict_SetItemString(d,"TAB_TRAVERSAL", SWIG_PyObj_FromInt((int)wxTAB_TRAVERSAL)); + PyDict_SetItemString(d,"WANTS_CHARS", SWIG_PyObj_FromInt((int)wxWANTS_CHARS)); + PyDict_SetItemString(d,"POPUP_WINDOW", SWIG_PyObj_FromInt((int)wxPOPUP_WINDOW)); + PyDict_SetItemString(d,"CENTER_FRAME", SWIG_PyObj_FromInt((int)wxCENTER_FRAME)); + PyDict_SetItemString(d,"CENTRE_ON_SCREEN", SWIG_PyObj_FromInt((int)wxCENTRE_ON_SCREEN)); + PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_PyObj_FromInt((int)wxCENTER_ON_SCREEN)); + PyDict_SetItemString(d,"STAY_ON_TOP", SWIG_PyObj_FromInt((int)wxSTAY_ON_TOP)); + PyDict_SetItemString(d,"ICONIZE", SWIG_PyObj_FromInt((int)wxICONIZE)); + PyDict_SetItemString(d,"MINIMIZE", SWIG_PyObj_FromInt((int)wxMINIMIZE)); + PyDict_SetItemString(d,"MAXIMIZE", SWIG_PyObj_FromInt((int)wxMAXIMIZE)); + PyDict_SetItemString(d,"CLOSE_BOX", SWIG_PyObj_FromInt((int)wxCLOSE_BOX)); + PyDict_SetItemString(d,"THICK_FRAME", SWIG_PyObj_FromInt((int)wxTHICK_FRAME)); + PyDict_SetItemString(d,"SYSTEM_MENU", SWIG_PyObj_FromInt((int)wxSYSTEM_MENU)); + PyDict_SetItemString(d,"MINIMIZE_BOX", SWIG_PyObj_FromInt((int)wxMINIMIZE_BOX)); + PyDict_SetItemString(d,"MAXIMIZE_BOX", SWIG_PyObj_FromInt((int)wxMAXIMIZE_BOX)); + PyDict_SetItemString(d,"TINY_CAPTION_HORIZ", SWIG_PyObj_FromInt((int)wxTINY_CAPTION_HORIZ)); + PyDict_SetItemString(d,"TINY_CAPTION_VERT", SWIG_PyObj_FromInt((int)wxTINY_CAPTION_VERT)); + PyDict_SetItemString(d,"RESIZE_BOX", SWIG_PyObj_FromInt((int)wxRESIZE_BOX)); + PyDict_SetItemString(d,"RESIZE_BORDER", SWIG_PyObj_FromInt((int)wxRESIZE_BORDER)); + PyDict_SetItemString(d,"DIALOG_MODAL", SWIG_PyObj_FromInt((int)wxDIALOG_MODAL)); + PyDict_SetItemString(d,"DIALOG_MODELESS", SWIG_PyObj_FromInt((int)wxDIALOG_MODELESS)); + PyDict_SetItemString(d,"DIALOG_NO_PARENT", SWIG_PyObj_FromInt((int)wxDIALOG_NO_PARENT)); + PyDict_SetItemString(d,"DEFAULT_FRAME_STYLE", SWIG_PyObj_FromInt((int)wxDEFAULT_FRAME_STYLE)); + PyDict_SetItemString(d,"DEFAULT_DIALOG_STYLE", SWIG_PyObj_FromInt((int)wxDEFAULT_DIALOG_STYLE)); + PyDict_SetItemString(d,"FRAME_TOOL_WINDOW", SWIG_PyObj_FromInt((int)wxFRAME_TOOL_WINDOW)); + PyDict_SetItemString(d,"FRAME_FLOAT_ON_PARENT", SWIG_PyObj_FromInt((int)wxFRAME_FLOAT_ON_PARENT)); + PyDict_SetItemString(d,"FRAME_NO_WINDOW_MENU", SWIG_PyObj_FromInt((int)wxFRAME_NO_WINDOW_MENU)); + PyDict_SetItemString(d,"FRAME_NO_TASKBAR", SWIG_PyObj_FromInt((int)wxFRAME_NO_TASKBAR)); + PyDict_SetItemString(d,"FRAME_SHAPED", SWIG_PyObj_FromInt((int)wxFRAME_SHAPED)); + PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_PyObj_FromInt((int)wxED_CLIENT_MARGIN)); + PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_PyObj_FromInt((int)wxED_BUTTONS_BOTTOM)); + PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_PyObj_FromInt((int)wxED_BUTTONS_RIGHT)); + PyDict_SetItemString(d,"ED_STATIC_LINE", SWIG_PyObj_FromInt((int)wxED_STATIC_LINE)); + PyDict_SetItemString(d,"EXT_DIALOG_STYLE", SWIG_PyObj_FromInt((int)wxEXT_DIALOG_STYLE)); + PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_PyObj_FromInt((int)wxCLIP_CHILDREN)); + PyDict_SetItemString(d,"CLIP_SIBLINGS", SWIG_PyObj_FromInt((int)wxCLIP_SIBLINGS)); + PyDict_SetItemString(d,"RETAINED", SWIG_PyObj_FromInt((int)wxRETAINED)); + PyDict_SetItemString(d,"BACKINGSTORE", SWIG_PyObj_FromInt((int)wxBACKINGSTORE)); + PyDict_SetItemString(d,"COLOURED", SWIG_PyObj_FromInt((int)wxCOLOURED)); + PyDict_SetItemString(d,"FIXED_LENGTH", SWIG_PyObj_FromInt((int)wxFIXED_LENGTH)); + PyDict_SetItemString(d,"LB_NEEDED_SB", SWIG_PyObj_FromInt((int)wxLB_NEEDED_SB)); + PyDict_SetItemString(d,"LB_ALWAYS_SB", SWIG_PyObj_FromInt((int)wxLB_ALWAYS_SB)); + PyDict_SetItemString(d,"LB_SORT", SWIG_PyObj_FromInt((int)wxLB_SORT)); + PyDict_SetItemString(d,"LB_SINGLE", SWIG_PyObj_FromInt((int)wxLB_SINGLE)); + PyDict_SetItemString(d,"LB_MULTIPLE", SWIG_PyObj_FromInt((int)wxLB_MULTIPLE)); + PyDict_SetItemString(d,"LB_EXTENDED", SWIG_PyObj_FromInt((int)wxLB_EXTENDED)); + PyDict_SetItemString(d,"LB_OWNERDRAW", SWIG_PyObj_FromInt((int)wxLB_OWNERDRAW)); + PyDict_SetItemString(d,"LB_HSCROLL", SWIG_PyObj_FromInt((int)wxLB_HSCROLL)); + PyDict_SetItemString(d,"PROCESS_ENTER", SWIG_PyObj_FromInt((int)wxPROCESS_ENTER)); + PyDict_SetItemString(d,"PASSWORD", SWIG_PyObj_FromInt((int)wxPASSWORD)); + PyDict_SetItemString(d,"CB_SIMPLE", SWIG_PyObj_FromInt((int)wxCB_SIMPLE)); + PyDict_SetItemString(d,"CB_DROPDOWN", SWIG_PyObj_FromInt((int)wxCB_DROPDOWN)); + PyDict_SetItemString(d,"CB_SORT", SWIG_PyObj_FromInt((int)wxCB_SORT)); + PyDict_SetItemString(d,"CB_READONLY", SWIG_PyObj_FromInt((int)wxCB_READONLY)); + PyDict_SetItemString(d,"RA_HORIZONTAL", SWIG_PyObj_FromInt((int)wxRA_HORIZONTAL)); + PyDict_SetItemString(d,"RA_VERTICAL", SWIG_PyObj_FromInt((int)wxRA_VERTICAL)); + PyDict_SetItemString(d,"RA_SPECIFY_ROWS", SWIG_PyObj_FromInt((int)wxRA_SPECIFY_ROWS)); + PyDict_SetItemString(d,"RA_SPECIFY_COLS", SWIG_PyObj_FromInt((int)wxRA_SPECIFY_COLS)); + PyDict_SetItemString(d,"RB_GROUP", SWIG_PyObj_FromInt((int)wxRB_GROUP)); + PyDict_SetItemString(d,"RB_SINGLE", SWIG_PyObj_FromInt((int)wxRB_SINGLE)); + PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSL_HORIZONTAL)); + PyDict_SetItemString(d,"SL_VERTICAL", SWIG_PyObj_FromInt((int)wxSL_VERTICAL)); + PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_PyObj_FromInt((int)wxSL_AUTOTICKS)); + PyDict_SetItemString(d,"SL_LABELS", SWIG_PyObj_FromInt((int)wxSL_LABELS)); + PyDict_SetItemString(d,"SL_LEFT", SWIG_PyObj_FromInt((int)wxSL_LEFT)); + PyDict_SetItemString(d,"SL_TOP", SWIG_PyObj_FromInt((int)wxSL_TOP)); + PyDict_SetItemString(d,"SL_RIGHT", SWIG_PyObj_FromInt((int)wxSL_RIGHT)); + PyDict_SetItemString(d,"SL_BOTTOM", SWIG_PyObj_FromInt((int)wxSL_BOTTOM)); + PyDict_SetItemString(d,"SL_BOTH", SWIG_PyObj_FromInt((int)wxSL_BOTH)); + PyDict_SetItemString(d,"SL_SELRANGE", SWIG_PyObj_FromInt((int)wxSL_SELRANGE)); + PyDict_SetItemString(d,"SB_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSB_HORIZONTAL)); + PyDict_SetItemString(d,"SB_VERTICAL", SWIG_PyObj_FromInt((int)wxSB_VERTICAL)); + PyDict_SetItemString(d,"ST_SIZEGRIP", SWIG_PyObj_FromInt((int)wxST_SIZEGRIP)); + PyDict_SetItemString(d,"ST_NO_AUTORESIZE", SWIG_PyObj_FromInt((int)wxST_NO_AUTORESIZE)); + PyDict_SetItemString(d,"FLOOD_SURFACE", SWIG_PyObj_FromInt((int)wxFLOOD_SURFACE)); + PyDict_SetItemString(d,"FLOOD_BORDER", SWIG_PyObj_FromInt((int)wxFLOOD_BORDER)); + PyDict_SetItemString(d,"ODDEVEN_RULE", SWIG_PyObj_FromInt((int)wxODDEVEN_RULE)); + PyDict_SetItemString(d,"WINDING_RULE", SWIG_PyObj_FromInt((int)wxWINDING_RULE)); + PyDict_SetItemString(d,"TOOL_TOP", SWIG_PyObj_FromInt((int)wxTOOL_TOP)); + PyDict_SetItemString(d,"TOOL_BOTTOM", SWIG_PyObj_FromInt((int)wxTOOL_BOTTOM)); + PyDict_SetItemString(d,"TOOL_LEFT", SWIG_PyObj_FromInt((int)wxTOOL_LEFT)); + PyDict_SetItemString(d,"TOOL_RIGHT", SWIG_PyObj_FromInt((int)wxTOOL_RIGHT)); + PyDict_SetItemString(d,"OK", SWIG_PyObj_FromInt((int)wxOK)); + PyDict_SetItemString(d,"YES_NO", SWIG_PyObj_FromInt((int)wxYES_NO)); + PyDict_SetItemString(d,"CANCEL", SWIG_PyObj_FromInt((int)wxCANCEL)); + PyDict_SetItemString(d,"YES", SWIG_PyObj_FromInt((int)wxYES)); + PyDict_SetItemString(d,"NO", SWIG_PyObj_FromInt((int)wxNO)); + PyDict_SetItemString(d,"NO_DEFAULT", SWIG_PyObj_FromInt((int)wxNO_DEFAULT)); + PyDict_SetItemString(d,"YES_DEFAULT", SWIG_PyObj_FromInt((int)wxYES_DEFAULT)); + PyDict_SetItemString(d,"ICON_EXCLAMATION", SWIG_PyObj_FromInt((int)wxICON_EXCLAMATION)); + PyDict_SetItemString(d,"ICON_HAND", SWIG_PyObj_FromInt((int)wxICON_HAND)); + PyDict_SetItemString(d,"ICON_QUESTION", SWIG_PyObj_FromInt((int)wxICON_QUESTION)); + PyDict_SetItemString(d,"ICON_INFORMATION", SWIG_PyObj_FromInt((int)wxICON_INFORMATION)); + PyDict_SetItemString(d,"ICON_STOP", SWIG_PyObj_FromInt((int)wxICON_STOP)); + PyDict_SetItemString(d,"ICON_ASTERISK", SWIG_PyObj_FromInt((int)wxICON_ASTERISK)); + PyDict_SetItemString(d,"ICON_MASK", SWIG_PyObj_FromInt((int)wxICON_MASK)); + PyDict_SetItemString(d,"ICON_WARNING", SWIG_PyObj_FromInt((int)wxICON_WARNING)); + PyDict_SetItemString(d,"ICON_ERROR", SWIG_PyObj_FromInt((int)wxICON_ERROR)); + PyDict_SetItemString(d,"FORWARD", SWIG_PyObj_FromInt((int)wxFORWARD)); + PyDict_SetItemString(d,"BACKWARD", SWIG_PyObj_FromInt((int)wxBACKWARD)); + PyDict_SetItemString(d,"RESET", SWIG_PyObj_FromInt((int)wxRESET)); + PyDict_SetItemString(d,"HELP", SWIG_PyObj_FromInt((int)wxHELP)); + PyDict_SetItemString(d,"MORE", SWIG_PyObj_FromInt((int)wxMORE)); + PyDict_SetItemString(d,"SETUP", SWIG_PyObj_FromInt((int)wxSETUP)); + PyDict_SetItemString(d,"SIZE_AUTO_WIDTH", SWIG_PyObj_FromInt((int)wxSIZE_AUTO_WIDTH)); + PyDict_SetItemString(d,"SIZE_AUTO_HEIGHT", SWIG_PyObj_FromInt((int)wxSIZE_AUTO_HEIGHT)); + PyDict_SetItemString(d,"SIZE_AUTO", SWIG_PyObj_FromInt((int)wxSIZE_AUTO)); + PyDict_SetItemString(d,"SIZE_USE_EXISTING", SWIG_PyObj_FromInt((int)wxSIZE_USE_EXISTING)); + PyDict_SetItemString(d,"SIZE_ALLOW_MINUS_ONE", SWIG_PyObj_FromInt((int)wxSIZE_ALLOW_MINUS_ONE)); + PyDict_SetItemString(d,"PORTRAIT", SWIG_PyObj_FromInt((int)wxPORTRAIT)); + PyDict_SetItemString(d,"LANDSCAPE", SWIG_PyObj_FromInt((int)wxLANDSCAPE)); + PyDict_SetItemString(d,"PRINT_QUALITY_HIGH", SWIG_PyObj_FromInt((int)wxPRINT_QUALITY_HIGH)); + PyDict_SetItemString(d,"PRINT_QUALITY_MEDIUM", SWIG_PyObj_FromInt((int)wxPRINT_QUALITY_MEDIUM)); + PyDict_SetItemString(d,"PRINT_QUALITY_LOW", SWIG_PyObj_FromInt((int)wxPRINT_QUALITY_LOW)); + PyDict_SetItemString(d,"PRINT_QUALITY_DRAFT", SWIG_PyObj_FromInt((int)wxPRINT_QUALITY_DRAFT)); + PyDict_SetItemString(d,"ID_ANY", SWIG_PyObj_FromInt((int)wxID_ANY)); + PyDict_SetItemString(d,"ID_SEPARATOR", SWIG_PyObj_FromInt((int)wxID_SEPARATOR)); + PyDict_SetItemString(d,"ID_LOWEST", SWIG_PyObj_FromInt((int)wxID_LOWEST)); + PyDict_SetItemString(d,"ID_OPEN", SWIG_PyObj_FromInt((int)wxID_OPEN)); + PyDict_SetItemString(d,"ID_CLOSE", SWIG_PyObj_FromInt((int)wxID_CLOSE)); + PyDict_SetItemString(d,"ID_NEW", SWIG_PyObj_FromInt((int)wxID_NEW)); + PyDict_SetItemString(d,"ID_SAVE", SWIG_PyObj_FromInt((int)wxID_SAVE)); + PyDict_SetItemString(d,"ID_SAVEAS", SWIG_PyObj_FromInt((int)wxID_SAVEAS)); + PyDict_SetItemString(d,"ID_REVERT", SWIG_PyObj_FromInt((int)wxID_REVERT)); + PyDict_SetItemString(d,"ID_EXIT", SWIG_PyObj_FromInt((int)wxID_EXIT)); + PyDict_SetItemString(d,"ID_UNDO", SWIG_PyObj_FromInt((int)wxID_UNDO)); + PyDict_SetItemString(d,"ID_REDO", SWIG_PyObj_FromInt((int)wxID_REDO)); + PyDict_SetItemString(d,"ID_HELP", SWIG_PyObj_FromInt((int)wxID_HELP)); + PyDict_SetItemString(d,"ID_PRINT", SWIG_PyObj_FromInt((int)wxID_PRINT)); + PyDict_SetItemString(d,"ID_PRINT_SETUP", SWIG_PyObj_FromInt((int)wxID_PRINT_SETUP)); + PyDict_SetItemString(d,"ID_PREVIEW", SWIG_PyObj_FromInt((int)wxID_PREVIEW)); + PyDict_SetItemString(d,"ID_ABOUT", SWIG_PyObj_FromInt((int)wxID_ABOUT)); + PyDict_SetItemString(d,"ID_HELP_CONTENTS", SWIG_PyObj_FromInt((int)wxID_HELP_CONTENTS)); + PyDict_SetItemString(d,"ID_HELP_COMMANDS", SWIG_PyObj_FromInt((int)wxID_HELP_COMMANDS)); + PyDict_SetItemString(d,"ID_HELP_PROCEDURES", SWIG_PyObj_FromInt((int)wxID_HELP_PROCEDURES)); + PyDict_SetItemString(d,"ID_HELP_CONTEXT", SWIG_PyObj_FromInt((int)wxID_HELP_CONTEXT)); + PyDict_SetItemString(d,"ID_CLOSE_ALL", SWIG_PyObj_FromInt((int)wxID_CLOSE_ALL)); + PyDict_SetItemString(d,"ID_PREFERENCES", SWIG_PyObj_FromInt((int)wxID_PREFERENCES)); + PyDict_SetItemString(d,"ID_CUT", SWIG_PyObj_FromInt((int)wxID_CUT)); + PyDict_SetItemString(d,"ID_COPY", SWIG_PyObj_FromInt((int)wxID_COPY)); + PyDict_SetItemString(d,"ID_PASTE", SWIG_PyObj_FromInt((int)wxID_PASTE)); + PyDict_SetItemString(d,"ID_CLEAR", SWIG_PyObj_FromInt((int)wxID_CLEAR)); + PyDict_SetItemString(d,"ID_FIND", SWIG_PyObj_FromInt((int)wxID_FIND)); + PyDict_SetItemString(d,"ID_DUPLICATE", SWIG_PyObj_FromInt((int)wxID_DUPLICATE)); + PyDict_SetItemString(d,"ID_SELECTALL", SWIG_PyObj_FromInt((int)wxID_SELECTALL)); + PyDict_SetItemString(d,"ID_DELETE", SWIG_PyObj_FromInt((int)wxID_DELETE)); + PyDict_SetItemString(d,"ID_REPLACE", SWIG_PyObj_FromInt((int)wxID_REPLACE)); + PyDict_SetItemString(d,"ID_REPLACE_ALL", SWIG_PyObj_FromInt((int)wxID_REPLACE_ALL)); + PyDict_SetItemString(d,"ID_PROPERTIES", SWIG_PyObj_FromInt((int)wxID_PROPERTIES)); + PyDict_SetItemString(d,"ID_VIEW_DETAILS", SWIG_PyObj_FromInt((int)wxID_VIEW_DETAILS)); + PyDict_SetItemString(d,"ID_VIEW_LARGEICONS", SWIG_PyObj_FromInt((int)wxID_VIEW_LARGEICONS)); + PyDict_SetItemString(d,"ID_VIEW_SMALLICONS", SWIG_PyObj_FromInt((int)wxID_VIEW_SMALLICONS)); + PyDict_SetItemString(d,"ID_VIEW_LIST", SWIG_PyObj_FromInt((int)wxID_VIEW_LIST)); + PyDict_SetItemString(d,"ID_VIEW_SORTDATE", SWIG_PyObj_FromInt((int)wxID_VIEW_SORTDATE)); + PyDict_SetItemString(d,"ID_VIEW_SORTNAME", SWIG_PyObj_FromInt((int)wxID_VIEW_SORTNAME)); + PyDict_SetItemString(d,"ID_VIEW_SORTSIZE", SWIG_PyObj_FromInt((int)wxID_VIEW_SORTSIZE)); + PyDict_SetItemString(d,"ID_VIEW_SORTTYPE", SWIG_PyObj_FromInt((int)wxID_VIEW_SORTTYPE)); + PyDict_SetItemString(d,"ID_FILE1", SWIG_PyObj_FromInt((int)wxID_FILE1)); + PyDict_SetItemString(d,"ID_FILE2", SWIG_PyObj_FromInt((int)wxID_FILE2)); + PyDict_SetItemString(d,"ID_FILE3", SWIG_PyObj_FromInt((int)wxID_FILE3)); + PyDict_SetItemString(d,"ID_FILE4", SWIG_PyObj_FromInt((int)wxID_FILE4)); + PyDict_SetItemString(d,"ID_FILE5", SWIG_PyObj_FromInt((int)wxID_FILE5)); + PyDict_SetItemString(d,"ID_FILE6", SWIG_PyObj_FromInt((int)wxID_FILE6)); + PyDict_SetItemString(d,"ID_FILE7", SWIG_PyObj_FromInt((int)wxID_FILE7)); + PyDict_SetItemString(d,"ID_FILE8", SWIG_PyObj_FromInt((int)wxID_FILE8)); + PyDict_SetItemString(d,"ID_FILE9", SWIG_PyObj_FromInt((int)wxID_FILE9)); + PyDict_SetItemString(d,"ID_OK", SWIG_PyObj_FromInt((int)wxID_OK)); + PyDict_SetItemString(d,"ID_CANCEL", SWIG_PyObj_FromInt((int)wxID_CANCEL)); + PyDict_SetItemString(d,"ID_APPLY", SWIG_PyObj_FromInt((int)wxID_APPLY)); + PyDict_SetItemString(d,"ID_YES", SWIG_PyObj_FromInt((int)wxID_YES)); + PyDict_SetItemString(d,"ID_NO", SWIG_PyObj_FromInt((int)wxID_NO)); + PyDict_SetItemString(d,"ID_STATIC", SWIG_PyObj_FromInt((int)wxID_STATIC)); + PyDict_SetItemString(d,"ID_FORWARD", SWIG_PyObj_FromInt((int)wxID_FORWARD)); + PyDict_SetItemString(d,"ID_BACKWARD", SWIG_PyObj_FromInt((int)wxID_BACKWARD)); + PyDict_SetItemString(d,"ID_DEFAULT", SWIG_PyObj_FromInt((int)wxID_DEFAULT)); + PyDict_SetItemString(d,"ID_MORE", SWIG_PyObj_FromInt((int)wxID_MORE)); + PyDict_SetItemString(d,"ID_SETUP", SWIG_PyObj_FromInt((int)wxID_SETUP)); + PyDict_SetItemString(d,"ID_RESET", SWIG_PyObj_FromInt((int)wxID_RESET)); + PyDict_SetItemString(d,"ID_CONTEXT_HELP", SWIG_PyObj_FromInt((int)wxID_CONTEXT_HELP)); + PyDict_SetItemString(d,"ID_YESTOALL", SWIG_PyObj_FromInt((int)wxID_YESTOALL)); + PyDict_SetItemString(d,"ID_NOTOALL", SWIG_PyObj_FromInt((int)wxID_NOTOALL)); + PyDict_SetItemString(d,"ID_ABORT", SWIG_PyObj_FromInt((int)wxID_ABORT)); + PyDict_SetItemString(d,"ID_RETRY", SWIG_PyObj_FromInt((int)wxID_RETRY)); + PyDict_SetItemString(d,"ID_IGNORE", SWIG_PyObj_FromInt((int)wxID_IGNORE)); + PyDict_SetItemString(d,"ID_HIGHEST", SWIG_PyObj_FromInt((int)wxID_HIGHEST)); + PyDict_SetItemString(d,"OPEN", SWIG_PyObj_FromInt((int)wxOPEN)); + PyDict_SetItemString(d,"SAVE", SWIG_PyObj_FromInt((int)wxSAVE)); + PyDict_SetItemString(d,"HIDE_READONLY", SWIG_PyObj_FromInt((int)wxHIDE_READONLY)); + PyDict_SetItemString(d,"OVERWRITE_PROMPT", SWIG_PyObj_FromInt((int)wxOVERWRITE_PROMPT)); + PyDict_SetItemString(d,"FILE_MUST_EXIST", SWIG_PyObj_FromInt((int)wxFILE_MUST_EXIST)); + PyDict_SetItemString(d,"MULTIPLE", SWIG_PyObj_FromInt((int)wxMULTIPLE)); + PyDict_SetItemString(d,"CHANGE_DIR", SWIG_PyObj_FromInt((int)wxCHANGE_DIR)); + PyDict_SetItemString(d,"ACCEL_ALT", SWIG_PyObj_FromInt((int)wxACCEL_ALT)); + PyDict_SetItemString(d,"ACCEL_CTRL", SWIG_PyObj_FromInt((int)wxACCEL_CTRL)); + PyDict_SetItemString(d,"ACCEL_SHIFT", SWIG_PyObj_FromInt((int)wxACCEL_SHIFT)); + PyDict_SetItemString(d,"ACCEL_NORMAL", SWIG_PyObj_FromInt((int)wxACCEL_NORMAL)); + PyDict_SetItemString(d,"PD_AUTO_HIDE", SWIG_PyObj_FromInt((int)wxPD_AUTO_HIDE)); + PyDict_SetItemString(d,"PD_APP_MODAL", SWIG_PyObj_FromInt((int)wxPD_APP_MODAL)); + PyDict_SetItemString(d,"PD_CAN_ABORT", SWIG_PyObj_FromInt((int)wxPD_CAN_ABORT)); + PyDict_SetItemString(d,"PD_ELAPSED_TIME", SWIG_PyObj_FromInt((int)wxPD_ELAPSED_TIME)); + PyDict_SetItemString(d,"PD_ESTIMATED_TIME", SWIG_PyObj_FromInt((int)wxPD_ESTIMATED_TIME)); + PyDict_SetItemString(d,"PD_REMAINING_TIME", SWIG_PyObj_FromInt((int)wxPD_REMAINING_TIME)); + PyDict_SetItemString(d,"DD_NEW_DIR_BUTTON", SWIG_PyObj_FromInt((int)wxDD_NEW_DIR_BUTTON)); + PyDict_SetItemString(d,"DD_DEFAULT_STYLE", SWIG_PyObj_FromInt((int)wxDD_DEFAULT_STYLE)); + PyDict_SetItemString(d,"MENU_TEAROFF", SWIG_PyObj_FromInt((int)wxMENU_TEAROFF)); + PyDict_SetItemString(d,"MB_DOCKABLE", SWIG_PyObj_FromInt((int)wxMB_DOCKABLE)); + PyDict_SetItemString(d,"NO_FULL_REPAINT_ON_RESIZE", SWIG_PyObj_FromInt((int)wxNO_FULL_REPAINT_ON_RESIZE)); + PyDict_SetItemString(d,"FULL_REPAINT_ON_RESIZE", SWIG_PyObj_FromInt((int)wxFULL_REPAINT_ON_RESIZE)); + PyDict_SetItemString(d,"LI_HORIZONTAL", SWIG_PyObj_FromInt((int)wxLI_HORIZONTAL)); + PyDict_SetItemString(d,"LI_VERTICAL", SWIG_PyObj_FromInt((int)wxLI_VERTICAL)); + PyDict_SetItemString(d,"WS_EX_VALIDATE_RECURSIVELY", SWIG_PyObj_FromInt((int)wxWS_EX_VALIDATE_RECURSIVELY)); + PyDict_SetItemString(d,"WS_EX_BLOCK_EVENTS", SWIG_PyObj_FromInt((int)wxWS_EX_BLOCK_EVENTS)); + PyDict_SetItemString(d,"WS_EX_TRANSIENT", SWIG_PyObj_FromInt((int)wxWS_EX_TRANSIENT)); + PyDict_SetItemString(d,"WS_EX_THEMED_BACKGROUND", SWIG_PyObj_FromInt((int)wxWS_EX_THEMED_BACKGROUND)); + PyDict_SetItemString(d,"WS_EX_PROCESS_IDLE", SWIG_PyObj_FromInt((int)wxWS_EX_PROCESS_IDLE)); + PyDict_SetItemString(d,"WS_EX_PROCESS_UI_UPDATES", SWIG_PyObj_FromInt((int)wxWS_EX_PROCESS_UI_UPDATES)); + PyDict_SetItemString(d,"MM_TEXT", SWIG_PyObj_FromInt((int)wxMM_TEXT)); + PyDict_SetItemString(d,"MM_LOMETRIC", SWIG_PyObj_FromInt((int)wxMM_LOMETRIC)); + PyDict_SetItemString(d,"MM_HIMETRIC", SWIG_PyObj_FromInt((int)wxMM_HIMETRIC)); + PyDict_SetItemString(d,"MM_LOENGLISH", SWIG_PyObj_FromInt((int)wxMM_LOENGLISH)); + PyDict_SetItemString(d,"MM_HIENGLISH", SWIG_PyObj_FromInt((int)wxMM_HIENGLISH)); + PyDict_SetItemString(d,"MM_TWIPS", SWIG_PyObj_FromInt((int)wxMM_TWIPS)); + PyDict_SetItemString(d,"MM_ISOTROPIC", SWIG_PyObj_FromInt((int)wxMM_ISOTROPIC)); + PyDict_SetItemString(d,"MM_ANISOTROPIC", SWIG_PyObj_FromInt((int)wxMM_ANISOTROPIC)); + PyDict_SetItemString(d,"MM_POINTS", SWIG_PyObj_FromInt((int)wxMM_POINTS)); + PyDict_SetItemString(d,"MM_METRIC", SWIG_PyObj_FromInt((int)wxMM_METRIC)); + PyDict_SetItemString(d,"CENTRE", SWIG_PyObj_FromInt((int)wxCENTRE)); + PyDict_SetItemString(d,"CENTER", SWIG_PyObj_FromInt((int)wxCENTER)); + PyDict_SetItemString(d,"HORIZONTAL", SWIG_PyObj_FromInt((int)wxHORIZONTAL)); + PyDict_SetItemString(d,"VERTICAL", SWIG_PyObj_FromInt((int)wxVERTICAL)); + PyDict_SetItemString(d,"BOTH", SWIG_PyObj_FromInt((int)wxBOTH)); + PyDict_SetItemString(d,"LEFT", SWIG_PyObj_FromInt((int)wxLEFT)); + PyDict_SetItemString(d,"RIGHT", SWIG_PyObj_FromInt((int)wxRIGHT)); + PyDict_SetItemString(d,"UP", SWIG_PyObj_FromInt((int)wxUP)); + PyDict_SetItemString(d,"DOWN", SWIG_PyObj_FromInt((int)wxDOWN)); + PyDict_SetItemString(d,"TOP", SWIG_PyObj_FromInt((int)wxTOP)); + PyDict_SetItemString(d,"BOTTOM", SWIG_PyObj_FromInt((int)wxBOTTOM)); + PyDict_SetItemString(d,"NORTH", SWIG_PyObj_FromInt((int)wxNORTH)); + PyDict_SetItemString(d,"SOUTH", SWIG_PyObj_FromInt((int)wxSOUTH)); + PyDict_SetItemString(d,"WEST", SWIG_PyObj_FromInt((int)wxWEST)); + PyDict_SetItemString(d,"EAST", SWIG_PyObj_FromInt((int)wxEAST)); + PyDict_SetItemString(d,"ALL", SWIG_PyObj_FromInt((int)wxALL)); + PyDict_SetItemString(d,"ALIGN_NOT", SWIG_PyObj_FromInt((int)wxALIGN_NOT)); + PyDict_SetItemString(d,"ALIGN_CENTER_HORIZONTAL", SWIG_PyObj_FromInt((int)wxALIGN_CENTER_HORIZONTAL)); + PyDict_SetItemString(d,"ALIGN_CENTRE_HORIZONTAL", SWIG_PyObj_FromInt((int)wxALIGN_CENTRE_HORIZONTAL)); + PyDict_SetItemString(d,"ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxALIGN_LEFT)); + PyDict_SetItemString(d,"ALIGN_TOP", SWIG_PyObj_FromInt((int)wxALIGN_TOP)); + PyDict_SetItemString(d,"ALIGN_RIGHT", SWIG_PyObj_FromInt((int)wxALIGN_RIGHT)); + PyDict_SetItemString(d,"ALIGN_BOTTOM", SWIG_PyObj_FromInt((int)wxALIGN_BOTTOM)); + PyDict_SetItemString(d,"ALIGN_CENTER_VERTICAL", SWIG_PyObj_FromInt((int)wxALIGN_CENTER_VERTICAL)); + PyDict_SetItemString(d,"ALIGN_CENTRE_VERTICAL", SWIG_PyObj_FromInt((int)wxALIGN_CENTRE_VERTICAL)); + PyDict_SetItemString(d,"ALIGN_CENTER", SWIG_PyObj_FromInt((int)wxALIGN_CENTER)); + PyDict_SetItemString(d,"ALIGN_CENTRE", SWIG_PyObj_FromInt((int)wxALIGN_CENTRE)); + PyDict_SetItemString(d,"ALIGN_MASK", SWIG_PyObj_FromInt((int)wxALIGN_MASK)); + PyDict_SetItemString(d,"STRETCH_NOT", SWIG_PyObj_FromInt((int)wxSTRETCH_NOT)); + PyDict_SetItemString(d,"SHRINK", SWIG_PyObj_FromInt((int)wxSHRINK)); + PyDict_SetItemString(d,"GROW", SWIG_PyObj_FromInt((int)wxGROW)); + PyDict_SetItemString(d,"EXPAND", SWIG_PyObj_FromInt((int)wxEXPAND)); + PyDict_SetItemString(d,"SHAPED", SWIG_PyObj_FromInt((int)wxSHAPED)); + PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_PyObj_FromInt((int)wxADJUST_MINSIZE)); + PyDict_SetItemString(d,"TILE", SWIG_PyObj_FromInt((int)wxTILE)); + PyDict_SetItemString(d,"BORDER_DEFAULT", SWIG_PyObj_FromInt((int)wxBORDER_DEFAULT)); + PyDict_SetItemString(d,"BORDER_NONE", SWIG_PyObj_FromInt((int)wxBORDER_NONE)); + PyDict_SetItemString(d,"BORDER_STATIC", SWIG_PyObj_FromInt((int)wxBORDER_STATIC)); + PyDict_SetItemString(d,"BORDER_SIMPLE", SWIG_PyObj_FromInt((int)wxBORDER_SIMPLE)); + PyDict_SetItemString(d,"BORDER_RAISED", SWIG_PyObj_FromInt((int)wxBORDER_RAISED)); + PyDict_SetItemString(d,"BORDER_SUNKEN", SWIG_PyObj_FromInt((int)wxBORDER_SUNKEN)); + PyDict_SetItemString(d,"BORDER_DOUBLE", SWIG_PyObj_FromInt((int)wxBORDER_DOUBLE)); + PyDict_SetItemString(d,"BORDER_MASK", SWIG_PyObj_FromInt((int)wxBORDER_MASK)); + PyDict_SetItemString(d,"DEFAULT", SWIG_PyObj_FromInt((int)wxDEFAULT)); + PyDict_SetItemString(d,"DECORATIVE", SWIG_PyObj_FromInt((int)wxDECORATIVE)); + PyDict_SetItemString(d,"ROMAN", SWIG_PyObj_FromInt((int)wxROMAN)); + PyDict_SetItemString(d,"SCRIPT", SWIG_PyObj_FromInt((int)wxSCRIPT)); + PyDict_SetItemString(d,"SWISS", SWIG_PyObj_FromInt((int)wxSWISS)); + PyDict_SetItemString(d,"MODERN", SWIG_PyObj_FromInt((int)wxMODERN)); + PyDict_SetItemString(d,"TELETYPE", SWIG_PyObj_FromInt((int)wxTELETYPE)); + PyDict_SetItemString(d,"VARIABLE", SWIG_PyObj_FromInt((int)wxVARIABLE)); + PyDict_SetItemString(d,"FIXED", SWIG_PyObj_FromInt((int)wxFIXED)); + PyDict_SetItemString(d,"NORMAL", SWIG_PyObj_FromInt((int)wxNORMAL)); + PyDict_SetItemString(d,"LIGHT", SWIG_PyObj_FromInt((int)wxLIGHT)); + PyDict_SetItemString(d,"BOLD", SWIG_PyObj_FromInt((int)wxBOLD)); + PyDict_SetItemString(d,"ITALIC", SWIG_PyObj_FromInt((int)wxITALIC)); + PyDict_SetItemString(d,"SLANT", SWIG_PyObj_FromInt((int)wxSLANT)); + PyDict_SetItemString(d,"SOLID", SWIG_PyObj_FromInt((int)wxSOLID)); + PyDict_SetItemString(d,"DOT", SWIG_PyObj_FromInt((int)wxDOT)); + PyDict_SetItemString(d,"LONG_DASH", SWIG_PyObj_FromInt((int)wxLONG_DASH)); + PyDict_SetItemString(d,"SHORT_DASH", SWIG_PyObj_FromInt((int)wxSHORT_DASH)); + PyDict_SetItemString(d,"DOT_DASH", SWIG_PyObj_FromInt((int)wxDOT_DASH)); + PyDict_SetItemString(d,"USER_DASH", SWIG_PyObj_FromInt((int)wxUSER_DASH)); + PyDict_SetItemString(d,"TRANSPARENT", SWIG_PyObj_FromInt((int)wxTRANSPARENT)); + PyDict_SetItemString(d,"STIPPLE", SWIG_PyObj_FromInt((int)wxSTIPPLE)); + PyDict_SetItemString(d,"BDIAGONAL_HATCH", SWIG_PyObj_FromInt((int)wxBDIAGONAL_HATCH)); + PyDict_SetItemString(d,"CROSSDIAG_HATCH", SWIG_PyObj_FromInt((int)wxCROSSDIAG_HATCH)); + PyDict_SetItemString(d,"FDIAGONAL_HATCH", SWIG_PyObj_FromInt((int)wxFDIAGONAL_HATCH)); + PyDict_SetItemString(d,"CROSS_HATCH", SWIG_PyObj_FromInt((int)wxCROSS_HATCH)); + PyDict_SetItemString(d,"HORIZONTAL_HATCH", SWIG_PyObj_FromInt((int)wxHORIZONTAL_HATCH)); + PyDict_SetItemString(d,"VERTICAL_HATCH", SWIG_PyObj_FromInt((int)wxVERTICAL_HATCH)); + PyDict_SetItemString(d,"JOIN_BEVEL", SWIG_PyObj_FromInt((int)wxJOIN_BEVEL)); + PyDict_SetItemString(d,"JOIN_MITER", SWIG_PyObj_FromInt((int)wxJOIN_MITER)); + PyDict_SetItemString(d,"JOIN_ROUND", SWIG_PyObj_FromInt((int)wxJOIN_ROUND)); + PyDict_SetItemString(d,"CAP_ROUND", SWIG_PyObj_FromInt((int)wxCAP_ROUND)); + PyDict_SetItemString(d,"CAP_PROJECTING", SWIG_PyObj_FromInt((int)wxCAP_PROJECTING)); + PyDict_SetItemString(d,"CAP_BUTT", SWIG_PyObj_FromInt((int)wxCAP_BUTT)); + PyDict_SetItemString(d,"CLEAR", SWIG_PyObj_FromInt((int)wxCLEAR)); + PyDict_SetItemString(d,"XOR", SWIG_PyObj_FromInt((int)wxXOR)); + PyDict_SetItemString(d,"INVERT", SWIG_PyObj_FromInt((int)wxINVERT)); + PyDict_SetItemString(d,"OR_REVERSE", SWIG_PyObj_FromInt((int)wxOR_REVERSE)); + PyDict_SetItemString(d,"AND_REVERSE", SWIG_PyObj_FromInt((int)wxAND_REVERSE)); + PyDict_SetItemString(d,"COPY", SWIG_PyObj_FromInt((int)wxCOPY)); + PyDict_SetItemString(d,"AND", SWIG_PyObj_FromInt((int)wxAND)); + PyDict_SetItemString(d,"AND_INVERT", SWIG_PyObj_FromInt((int)wxAND_INVERT)); + PyDict_SetItemString(d,"NO_OP", SWIG_PyObj_FromInt((int)wxNO_OP)); + PyDict_SetItemString(d,"NOR", SWIG_PyObj_FromInt((int)wxNOR)); + PyDict_SetItemString(d,"EQUIV", SWIG_PyObj_FromInt((int)wxEQUIV)); + PyDict_SetItemString(d,"SRC_INVERT", SWIG_PyObj_FromInt((int)wxSRC_INVERT)); + PyDict_SetItemString(d,"OR_INVERT", SWIG_PyObj_FromInt((int)wxOR_INVERT)); + PyDict_SetItemString(d,"NAND", SWIG_PyObj_FromInt((int)wxNAND)); + PyDict_SetItemString(d,"OR", SWIG_PyObj_FromInt((int)wxOR)); + PyDict_SetItemString(d,"SET", SWIG_PyObj_FromInt((int)wxSET)); + PyDict_SetItemString(d,"WXK_BACK", SWIG_PyObj_FromInt((int)WXK_BACK)); + PyDict_SetItemString(d,"WXK_TAB", SWIG_PyObj_FromInt((int)WXK_TAB)); + PyDict_SetItemString(d,"WXK_RETURN", SWIG_PyObj_FromInt((int)WXK_RETURN)); + PyDict_SetItemString(d,"WXK_ESCAPE", SWIG_PyObj_FromInt((int)WXK_ESCAPE)); + PyDict_SetItemString(d,"WXK_SPACE", SWIG_PyObj_FromInt((int)WXK_SPACE)); + PyDict_SetItemString(d,"WXK_DELETE", SWIG_PyObj_FromInt((int)WXK_DELETE)); + PyDict_SetItemString(d,"WXK_START", SWIG_PyObj_FromInt((int)WXK_START)); + PyDict_SetItemString(d,"WXK_LBUTTON", SWIG_PyObj_FromInt((int)WXK_LBUTTON)); + PyDict_SetItemString(d,"WXK_RBUTTON", SWIG_PyObj_FromInt((int)WXK_RBUTTON)); + PyDict_SetItemString(d,"WXK_CANCEL", SWIG_PyObj_FromInt((int)WXK_CANCEL)); + PyDict_SetItemString(d,"WXK_MBUTTON", SWIG_PyObj_FromInt((int)WXK_MBUTTON)); + PyDict_SetItemString(d,"WXK_CLEAR", SWIG_PyObj_FromInt((int)WXK_CLEAR)); + PyDict_SetItemString(d,"WXK_SHIFT", SWIG_PyObj_FromInt((int)WXK_SHIFT)); + PyDict_SetItemString(d,"WXK_ALT", SWIG_PyObj_FromInt((int)WXK_ALT)); + PyDict_SetItemString(d,"WXK_CONTROL", SWIG_PyObj_FromInt((int)WXK_CONTROL)); + PyDict_SetItemString(d,"WXK_MENU", SWIG_PyObj_FromInt((int)WXK_MENU)); + PyDict_SetItemString(d,"WXK_PAUSE", SWIG_PyObj_FromInt((int)WXK_PAUSE)); + PyDict_SetItemString(d,"WXK_CAPITAL", SWIG_PyObj_FromInt((int)WXK_CAPITAL)); + PyDict_SetItemString(d,"WXK_PRIOR", SWIG_PyObj_FromInt((int)WXK_PRIOR)); + PyDict_SetItemString(d,"WXK_NEXT", SWIG_PyObj_FromInt((int)WXK_NEXT)); + PyDict_SetItemString(d,"WXK_END", SWIG_PyObj_FromInt((int)WXK_END)); + PyDict_SetItemString(d,"WXK_HOME", SWIG_PyObj_FromInt((int)WXK_HOME)); + PyDict_SetItemString(d,"WXK_LEFT", SWIG_PyObj_FromInt((int)WXK_LEFT)); + PyDict_SetItemString(d,"WXK_UP", SWIG_PyObj_FromInt((int)WXK_UP)); + PyDict_SetItemString(d,"WXK_RIGHT", SWIG_PyObj_FromInt((int)WXK_RIGHT)); + PyDict_SetItemString(d,"WXK_DOWN", SWIG_PyObj_FromInt((int)WXK_DOWN)); + PyDict_SetItemString(d,"WXK_SELECT", SWIG_PyObj_FromInt((int)WXK_SELECT)); + PyDict_SetItemString(d,"WXK_PRINT", SWIG_PyObj_FromInt((int)WXK_PRINT)); + PyDict_SetItemString(d,"WXK_EXECUTE", SWIG_PyObj_FromInt((int)WXK_EXECUTE)); + PyDict_SetItemString(d,"WXK_SNAPSHOT", SWIG_PyObj_FromInt((int)WXK_SNAPSHOT)); + PyDict_SetItemString(d,"WXK_INSERT", SWIG_PyObj_FromInt((int)WXK_INSERT)); + PyDict_SetItemString(d,"WXK_HELP", SWIG_PyObj_FromInt((int)WXK_HELP)); + PyDict_SetItemString(d,"WXK_NUMPAD0", SWIG_PyObj_FromInt((int)WXK_NUMPAD0)); + PyDict_SetItemString(d,"WXK_NUMPAD1", SWIG_PyObj_FromInt((int)WXK_NUMPAD1)); + PyDict_SetItemString(d,"WXK_NUMPAD2", SWIG_PyObj_FromInt((int)WXK_NUMPAD2)); + PyDict_SetItemString(d,"WXK_NUMPAD3", SWIG_PyObj_FromInt((int)WXK_NUMPAD3)); + PyDict_SetItemString(d,"WXK_NUMPAD4", SWIG_PyObj_FromInt((int)WXK_NUMPAD4)); + PyDict_SetItemString(d,"WXK_NUMPAD5", SWIG_PyObj_FromInt((int)WXK_NUMPAD5)); + PyDict_SetItemString(d,"WXK_NUMPAD6", SWIG_PyObj_FromInt((int)WXK_NUMPAD6)); + PyDict_SetItemString(d,"WXK_NUMPAD7", SWIG_PyObj_FromInt((int)WXK_NUMPAD7)); + PyDict_SetItemString(d,"WXK_NUMPAD8", SWIG_PyObj_FromInt((int)WXK_NUMPAD8)); + PyDict_SetItemString(d,"WXK_NUMPAD9", SWIG_PyObj_FromInt((int)WXK_NUMPAD9)); + PyDict_SetItemString(d,"WXK_MULTIPLY", SWIG_PyObj_FromInt((int)WXK_MULTIPLY)); + PyDict_SetItemString(d,"WXK_ADD", SWIG_PyObj_FromInt((int)WXK_ADD)); + PyDict_SetItemString(d,"WXK_SEPARATOR", SWIG_PyObj_FromInt((int)WXK_SEPARATOR)); + PyDict_SetItemString(d,"WXK_SUBTRACT", SWIG_PyObj_FromInt((int)WXK_SUBTRACT)); + PyDict_SetItemString(d,"WXK_DECIMAL", SWIG_PyObj_FromInt((int)WXK_DECIMAL)); + PyDict_SetItemString(d,"WXK_DIVIDE", SWIG_PyObj_FromInt((int)WXK_DIVIDE)); + PyDict_SetItemString(d,"WXK_F1", SWIG_PyObj_FromInt((int)WXK_F1)); + PyDict_SetItemString(d,"WXK_F2", SWIG_PyObj_FromInt((int)WXK_F2)); + PyDict_SetItemString(d,"WXK_F3", SWIG_PyObj_FromInt((int)WXK_F3)); + PyDict_SetItemString(d,"WXK_F4", SWIG_PyObj_FromInt((int)WXK_F4)); + PyDict_SetItemString(d,"WXK_F5", SWIG_PyObj_FromInt((int)WXK_F5)); + PyDict_SetItemString(d,"WXK_F6", SWIG_PyObj_FromInt((int)WXK_F6)); + PyDict_SetItemString(d,"WXK_F7", SWIG_PyObj_FromInt((int)WXK_F7)); + PyDict_SetItemString(d,"WXK_F8", SWIG_PyObj_FromInt((int)WXK_F8)); + PyDict_SetItemString(d,"WXK_F9", SWIG_PyObj_FromInt((int)WXK_F9)); + PyDict_SetItemString(d,"WXK_F10", SWIG_PyObj_FromInt((int)WXK_F10)); + PyDict_SetItemString(d,"WXK_F11", SWIG_PyObj_FromInt((int)WXK_F11)); + PyDict_SetItemString(d,"WXK_F12", SWIG_PyObj_FromInt((int)WXK_F12)); + PyDict_SetItemString(d,"WXK_F13", SWIG_PyObj_FromInt((int)WXK_F13)); + PyDict_SetItemString(d,"WXK_F14", SWIG_PyObj_FromInt((int)WXK_F14)); + PyDict_SetItemString(d,"WXK_F15", SWIG_PyObj_FromInt((int)WXK_F15)); + PyDict_SetItemString(d,"WXK_F16", SWIG_PyObj_FromInt((int)WXK_F16)); + PyDict_SetItemString(d,"WXK_F17", SWIG_PyObj_FromInt((int)WXK_F17)); + PyDict_SetItemString(d,"WXK_F18", SWIG_PyObj_FromInt((int)WXK_F18)); + PyDict_SetItemString(d,"WXK_F19", SWIG_PyObj_FromInt((int)WXK_F19)); + PyDict_SetItemString(d,"WXK_F20", SWIG_PyObj_FromInt((int)WXK_F20)); + PyDict_SetItemString(d,"WXK_F21", SWIG_PyObj_FromInt((int)WXK_F21)); + PyDict_SetItemString(d,"WXK_F22", SWIG_PyObj_FromInt((int)WXK_F22)); + PyDict_SetItemString(d,"WXK_F23", SWIG_PyObj_FromInt((int)WXK_F23)); + PyDict_SetItemString(d,"WXK_F24", SWIG_PyObj_FromInt((int)WXK_F24)); + PyDict_SetItemString(d,"WXK_NUMLOCK", SWIG_PyObj_FromInt((int)WXK_NUMLOCK)); + PyDict_SetItemString(d,"WXK_SCROLL", SWIG_PyObj_FromInt((int)WXK_SCROLL)); + PyDict_SetItemString(d,"WXK_PAGEUP", SWIG_PyObj_FromInt((int)WXK_PAGEUP)); + PyDict_SetItemString(d,"WXK_PAGEDOWN", SWIG_PyObj_FromInt((int)WXK_PAGEDOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_SPACE", SWIG_PyObj_FromInt((int)WXK_NUMPAD_SPACE)); + PyDict_SetItemString(d,"WXK_NUMPAD_TAB", SWIG_PyObj_FromInt((int)WXK_NUMPAD_TAB)); + PyDict_SetItemString(d,"WXK_NUMPAD_ENTER", SWIG_PyObj_FromInt((int)WXK_NUMPAD_ENTER)); + PyDict_SetItemString(d,"WXK_NUMPAD_F1", SWIG_PyObj_FromInt((int)WXK_NUMPAD_F1)); + PyDict_SetItemString(d,"WXK_NUMPAD_F2", SWIG_PyObj_FromInt((int)WXK_NUMPAD_F2)); + PyDict_SetItemString(d,"WXK_NUMPAD_F3", SWIG_PyObj_FromInt((int)WXK_NUMPAD_F3)); + PyDict_SetItemString(d,"WXK_NUMPAD_F4", SWIG_PyObj_FromInt((int)WXK_NUMPAD_F4)); + PyDict_SetItemString(d,"WXK_NUMPAD_HOME", SWIG_PyObj_FromInt((int)WXK_NUMPAD_HOME)); + PyDict_SetItemString(d,"WXK_NUMPAD_LEFT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_LEFT)); + PyDict_SetItemString(d,"WXK_NUMPAD_UP", SWIG_PyObj_FromInt((int)WXK_NUMPAD_UP)); + PyDict_SetItemString(d,"WXK_NUMPAD_RIGHT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_RIGHT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DOWN", SWIG_PyObj_FromInt((int)WXK_NUMPAD_DOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_PRIOR", SWIG_PyObj_FromInt((int)WXK_NUMPAD_PRIOR)); + PyDict_SetItemString(d,"WXK_NUMPAD_PAGEUP", SWIG_PyObj_FromInt((int)WXK_NUMPAD_PAGEUP)); + PyDict_SetItemString(d,"WXK_NUMPAD_NEXT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_NEXT)); + PyDict_SetItemString(d,"WXK_NUMPAD_PAGEDOWN", SWIG_PyObj_FromInt((int)WXK_NUMPAD_PAGEDOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_END", SWIG_PyObj_FromInt((int)WXK_NUMPAD_END)); + PyDict_SetItemString(d,"WXK_NUMPAD_BEGIN", SWIG_PyObj_FromInt((int)WXK_NUMPAD_BEGIN)); + PyDict_SetItemString(d,"WXK_NUMPAD_INSERT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_INSERT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DELETE", SWIG_PyObj_FromInt((int)WXK_NUMPAD_DELETE)); + PyDict_SetItemString(d,"WXK_NUMPAD_EQUAL", SWIG_PyObj_FromInt((int)WXK_NUMPAD_EQUAL)); + PyDict_SetItemString(d,"WXK_NUMPAD_MULTIPLY", SWIG_PyObj_FromInt((int)WXK_NUMPAD_MULTIPLY)); + PyDict_SetItemString(d,"WXK_NUMPAD_ADD", SWIG_PyObj_FromInt((int)WXK_NUMPAD_ADD)); + PyDict_SetItemString(d,"WXK_NUMPAD_SEPARATOR", SWIG_PyObj_FromInt((int)WXK_NUMPAD_SEPARATOR)); + PyDict_SetItemString(d,"WXK_NUMPAD_SUBTRACT", SWIG_PyObj_FromInt((int)WXK_NUMPAD_SUBTRACT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DECIMAL", SWIG_PyObj_FromInt((int)WXK_NUMPAD_DECIMAL)); + PyDict_SetItemString(d,"WXK_NUMPAD_DIVIDE", SWIG_PyObj_FromInt((int)WXK_NUMPAD_DIVIDE)); + PyDict_SetItemString(d,"WXK_WINDOWS_LEFT", SWIG_PyObj_FromInt((int)WXK_WINDOWS_LEFT)); + PyDict_SetItemString(d,"WXK_WINDOWS_RIGHT", SWIG_PyObj_FromInt((int)WXK_WINDOWS_RIGHT)); + PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_PyObj_FromInt((int)WXK_WINDOWS_MENU)); + PyDict_SetItemString(d,"PAPER_NONE", SWIG_PyObj_FromInt((int)wxPAPER_NONE)); + PyDict_SetItemString(d,"PAPER_LETTER", SWIG_PyObj_FromInt((int)wxPAPER_LETTER)); + PyDict_SetItemString(d,"PAPER_LEGAL", SWIG_PyObj_FromInt((int)wxPAPER_LEGAL)); + PyDict_SetItemString(d,"PAPER_A4", SWIG_PyObj_FromInt((int)wxPAPER_A4)); + PyDict_SetItemString(d,"PAPER_CSHEET", SWIG_PyObj_FromInt((int)wxPAPER_CSHEET)); + PyDict_SetItemString(d,"PAPER_DSHEET", SWIG_PyObj_FromInt((int)wxPAPER_DSHEET)); + PyDict_SetItemString(d,"PAPER_ESHEET", SWIG_PyObj_FromInt((int)wxPAPER_ESHEET)); + PyDict_SetItemString(d,"PAPER_LETTERSMALL", SWIG_PyObj_FromInt((int)wxPAPER_LETTERSMALL)); + PyDict_SetItemString(d,"PAPER_TABLOID", SWIG_PyObj_FromInt((int)wxPAPER_TABLOID)); + PyDict_SetItemString(d,"PAPER_LEDGER", SWIG_PyObj_FromInt((int)wxPAPER_LEDGER)); + PyDict_SetItemString(d,"PAPER_STATEMENT", SWIG_PyObj_FromInt((int)wxPAPER_STATEMENT)); + PyDict_SetItemString(d,"PAPER_EXECUTIVE", SWIG_PyObj_FromInt((int)wxPAPER_EXECUTIVE)); + PyDict_SetItemString(d,"PAPER_A3", SWIG_PyObj_FromInt((int)wxPAPER_A3)); + PyDict_SetItemString(d,"PAPER_A4SMALL", SWIG_PyObj_FromInt((int)wxPAPER_A4SMALL)); + PyDict_SetItemString(d,"PAPER_A5", SWIG_PyObj_FromInt((int)wxPAPER_A5)); + PyDict_SetItemString(d,"PAPER_B4", SWIG_PyObj_FromInt((int)wxPAPER_B4)); + PyDict_SetItemString(d,"PAPER_B5", SWIG_PyObj_FromInt((int)wxPAPER_B5)); + PyDict_SetItemString(d,"PAPER_FOLIO", SWIG_PyObj_FromInt((int)wxPAPER_FOLIO)); + PyDict_SetItemString(d,"PAPER_QUARTO", SWIG_PyObj_FromInt((int)wxPAPER_QUARTO)); + PyDict_SetItemString(d,"PAPER_10X14", SWIG_PyObj_FromInt((int)wxPAPER_10X14)); + PyDict_SetItemString(d,"PAPER_11X17", SWIG_PyObj_FromInt((int)wxPAPER_11X17)); + PyDict_SetItemString(d,"PAPER_NOTE", SWIG_PyObj_FromInt((int)wxPAPER_NOTE)); + PyDict_SetItemString(d,"PAPER_ENV_9", SWIG_PyObj_FromInt((int)wxPAPER_ENV_9)); + PyDict_SetItemString(d,"PAPER_ENV_10", SWIG_PyObj_FromInt((int)wxPAPER_ENV_10)); + PyDict_SetItemString(d,"PAPER_ENV_11", SWIG_PyObj_FromInt((int)wxPAPER_ENV_11)); + PyDict_SetItemString(d,"PAPER_ENV_12", SWIG_PyObj_FromInt((int)wxPAPER_ENV_12)); + PyDict_SetItemString(d,"PAPER_ENV_14", SWIG_PyObj_FromInt((int)wxPAPER_ENV_14)); + PyDict_SetItemString(d,"PAPER_ENV_DL", SWIG_PyObj_FromInt((int)wxPAPER_ENV_DL)); + PyDict_SetItemString(d,"PAPER_ENV_C5", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C5)); + PyDict_SetItemString(d,"PAPER_ENV_C3", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C3)); + PyDict_SetItemString(d,"PAPER_ENV_C4", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C4)); + PyDict_SetItemString(d,"PAPER_ENV_C6", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C6)); + PyDict_SetItemString(d,"PAPER_ENV_C65", SWIG_PyObj_FromInt((int)wxPAPER_ENV_C65)); + PyDict_SetItemString(d,"PAPER_ENV_B4", SWIG_PyObj_FromInt((int)wxPAPER_ENV_B4)); + PyDict_SetItemString(d,"PAPER_ENV_B5", SWIG_PyObj_FromInt((int)wxPAPER_ENV_B5)); + PyDict_SetItemString(d,"PAPER_ENV_B6", SWIG_PyObj_FromInt((int)wxPAPER_ENV_B6)); + PyDict_SetItemString(d,"PAPER_ENV_ITALY", SWIG_PyObj_FromInt((int)wxPAPER_ENV_ITALY)); + PyDict_SetItemString(d,"PAPER_ENV_MONARCH", SWIG_PyObj_FromInt((int)wxPAPER_ENV_MONARCH)); + PyDict_SetItemString(d,"PAPER_ENV_PERSONAL", SWIG_PyObj_FromInt((int)wxPAPER_ENV_PERSONAL)); + PyDict_SetItemString(d,"PAPER_FANFOLD_US", SWIG_PyObj_FromInt((int)wxPAPER_FANFOLD_US)); + PyDict_SetItemString(d,"PAPER_FANFOLD_STD_GERMAN", SWIG_PyObj_FromInt((int)wxPAPER_FANFOLD_STD_GERMAN)); + PyDict_SetItemString(d,"PAPER_FANFOLD_LGL_GERMAN", SWIG_PyObj_FromInt((int)wxPAPER_FANFOLD_LGL_GERMAN)); + PyDict_SetItemString(d,"PAPER_ISO_B4", SWIG_PyObj_FromInt((int)wxPAPER_ISO_B4)); + PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD", SWIG_PyObj_FromInt((int)wxPAPER_JAPANESE_POSTCARD)); + PyDict_SetItemString(d,"PAPER_9X11", SWIG_PyObj_FromInt((int)wxPAPER_9X11)); + PyDict_SetItemString(d,"PAPER_10X11", SWIG_PyObj_FromInt((int)wxPAPER_10X11)); + PyDict_SetItemString(d,"PAPER_15X11", SWIG_PyObj_FromInt((int)wxPAPER_15X11)); + PyDict_SetItemString(d,"PAPER_ENV_INVITE", SWIG_PyObj_FromInt((int)wxPAPER_ENV_INVITE)); + PyDict_SetItemString(d,"PAPER_LETTER_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_LETTER_EXTRA)); + PyDict_SetItemString(d,"PAPER_LEGAL_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_LEGAL_EXTRA)); + PyDict_SetItemString(d,"PAPER_TABLOID_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_TABLOID_EXTRA)); + PyDict_SetItemString(d,"PAPER_A4_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_A4_EXTRA)); + PyDict_SetItemString(d,"PAPER_LETTER_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_LETTER_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A4_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_A4_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_LETTER_EXTRA_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_LETTER_EXTRA_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A_PLUS", SWIG_PyObj_FromInt((int)wxPAPER_A_PLUS)); + PyDict_SetItemString(d,"PAPER_B_PLUS", SWIG_PyObj_FromInt((int)wxPAPER_B_PLUS)); + PyDict_SetItemString(d,"PAPER_LETTER_PLUS", SWIG_PyObj_FromInt((int)wxPAPER_LETTER_PLUS)); + PyDict_SetItemString(d,"PAPER_A4_PLUS", SWIG_PyObj_FromInt((int)wxPAPER_A4_PLUS)); + PyDict_SetItemString(d,"PAPER_A5_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_A5_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_B5_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_B5_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A3_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_A3_EXTRA)); + PyDict_SetItemString(d,"PAPER_A5_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_A5_EXTRA)); + PyDict_SetItemString(d,"PAPER_B5_EXTRA", SWIG_PyObj_FromInt((int)wxPAPER_B5_EXTRA)); + PyDict_SetItemString(d,"PAPER_A2", SWIG_PyObj_FromInt((int)wxPAPER_A2)); + PyDict_SetItemString(d,"PAPER_A3_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_A3_TRANSVERSE)); + PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_PyObj_FromInt((int)wxPAPER_A3_EXTRA_TRANSVERSE)); + PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_PyObj_FromInt((int)wxDUPLEX_SIMPLEX)); + PyDict_SetItemString(d,"DUPLEX_HORIZONTAL", SWIG_PyObj_FromInt((int)wxDUPLEX_HORIZONTAL)); + PyDict_SetItemString(d,"DUPLEX_VERTICAL", SWIG_PyObj_FromInt((int)wxDUPLEX_VERTICAL)); + PyDict_SetItemString(d,"ITEM_SEPARATOR", SWIG_PyObj_FromInt((int)wxITEM_SEPARATOR)); + PyDict_SetItemString(d,"ITEM_NORMAL", SWIG_PyObj_FromInt((int)wxITEM_NORMAL)); + PyDict_SetItemString(d,"ITEM_CHECK", SWIG_PyObj_FromInt((int)wxITEM_CHECK)); + PyDict_SetItemString(d,"ITEM_RADIO", SWIG_PyObj_FromInt((int)wxITEM_RADIO)); + PyDict_SetItemString(d,"ITEM_MAX", SWIG_PyObj_FromInt((int)wxITEM_MAX)); + PyDict_SetItemString(d,"HT_NOWHERE", SWIG_PyObj_FromInt((int)wxHT_NOWHERE)); + PyDict_SetItemString(d,"HT_SCROLLBAR_FIRST", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_FIRST)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_1", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_ARROW_LINE_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_2", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_ARROW_LINE_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_1", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_ARROW_PAGE_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_2", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_ARROW_PAGE_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_THUMB", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_THUMB)); + PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_1", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_BAR_1)); + PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_2", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_BAR_2)); + PyDict_SetItemString(d,"HT_SCROLLBAR_LAST", SWIG_PyObj_FromInt((int)wxHT_SCROLLBAR_LAST)); + PyDict_SetItemString(d,"HT_WINDOW_OUTSIDE", SWIG_PyObj_FromInt((int)wxHT_WINDOW_OUTSIDE)); + PyDict_SetItemString(d,"HT_WINDOW_INSIDE", SWIG_PyObj_FromInt((int)wxHT_WINDOW_INSIDE)); + PyDict_SetItemString(d,"HT_WINDOW_VERT_SCROLLBAR", SWIG_PyObj_FromInt((int)wxHT_WINDOW_VERT_SCROLLBAR)); + PyDict_SetItemString(d,"HT_WINDOW_HORZ_SCROLLBAR", SWIG_PyObj_FromInt((int)wxHT_WINDOW_HORZ_SCROLLBAR)); + PyDict_SetItemString(d,"HT_WINDOW_CORNER", SWIG_PyObj_FromInt((int)wxHT_WINDOW_CORNER)); + PyDict_SetItemString(d,"HT_MAX", SWIG_PyObj_FromInt((int)wxHT_MAX)); + PyDict_SetItemString(d,"MOD_NONE", SWIG_PyObj_FromInt((int)wxMOD_NONE)); + PyDict_SetItemString(d,"MOD_ALT", SWIG_PyObj_FromInt((int)wxMOD_ALT)); + PyDict_SetItemString(d,"MOD_CONTROL", SWIG_PyObj_FromInt((int)wxMOD_CONTROL)); + PyDict_SetItemString(d,"MOD_SHIFT", SWIG_PyObj_FromInt((int)wxMOD_SHIFT)); + PyDict_SetItemString(d,"MOD_WIN", SWIG_PyObj_FromInt((int)wxMOD_WIN)); + PyDict_SetItemString(d,"UPDATE_UI_NONE", SWIG_PyObj_FromInt((int)wxUPDATE_UI_NONE)); + PyDict_SetItemString(d,"UPDATE_UI_RECURSE", SWIG_PyObj_FromInt((int)wxUPDATE_UI_RECURSE)); + PyDict_SetItemString(d,"UPDATE_UI_FROMIDLE", SWIG_PyObj_FromInt((int)wxUPDATE_UI_FROMIDLE)); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set); + PyDict_SetItemString(d,"BITMAP_TYPE_INVALID", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_INVALID)); + PyDict_SetItemString(d,"BITMAP_TYPE_BMP", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_BMP)); + PyDict_SetItemString(d,"BITMAP_TYPE_ICO", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_ICO)); + PyDict_SetItemString(d,"BITMAP_TYPE_CUR", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_CUR)); + PyDict_SetItemString(d,"BITMAP_TYPE_XBM", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_XBM)); + PyDict_SetItemString(d,"BITMAP_TYPE_XBM_DATA", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_XBM_DATA)); + PyDict_SetItemString(d,"BITMAP_TYPE_XPM", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_XPM)); + PyDict_SetItemString(d,"BITMAP_TYPE_XPM_DATA", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_XPM_DATA)); + PyDict_SetItemString(d,"BITMAP_TYPE_TIF", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_TIF)); + PyDict_SetItemString(d,"BITMAP_TYPE_GIF", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_GIF)); + PyDict_SetItemString(d,"BITMAP_TYPE_PNG", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_PNG)); + PyDict_SetItemString(d,"BITMAP_TYPE_JPEG", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_JPEG)); + PyDict_SetItemString(d,"BITMAP_TYPE_PNM", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_PNM)); + PyDict_SetItemString(d,"BITMAP_TYPE_PCX", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_PCX)); + PyDict_SetItemString(d,"BITMAP_TYPE_PICT", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_PICT)); + PyDict_SetItemString(d,"BITMAP_TYPE_ICON", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_ICON)); + PyDict_SetItemString(d,"BITMAP_TYPE_ANI", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_ANI)); + PyDict_SetItemString(d,"BITMAP_TYPE_IFF", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_IFF)); + PyDict_SetItemString(d,"BITMAP_TYPE_MACCURSOR", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_MACCURSOR)); + PyDict_SetItemString(d,"BITMAP_TYPE_ANY", SWIG_PyObj_FromInt((int)wxBITMAP_TYPE_ANY)); + PyDict_SetItemString(d,"CURSOR_NONE", SWIG_PyObj_FromInt((int)wxCURSOR_NONE)); + PyDict_SetItemString(d,"CURSOR_ARROW", SWIG_PyObj_FromInt((int)wxCURSOR_ARROW)); + PyDict_SetItemString(d,"CURSOR_RIGHT_ARROW", SWIG_PyObj_FromInt((int)wxCURSOR_RIGHT_ARROW)); + PyDict_SetItemString(d,"CURSOR_BULLSEYE", SWIG_PyObj_FromInt((int)wxCURSOR_BULLSEYE)); + PyDict_SetItemString(d,"CURSOR_CHAR", SWIG_PyObj_FromInt((int)wxCURSOR_CHAR)); + PyDict_SetItemString(d,"CURSOR_CROSS", SWIG_PyObj_FromInt((int)wxCURSOR_CROSS)); + PyDict_SetItemString(d,"CURSOR_HAND", SWIG_PyObj_FromInt((int)wxCURSOR_HAND)); + PyDict_SetItemString(d,"CURSOR_IBEAM", SWIG_PyObj_FromInt((int)wxCURSOR_IBEAM)); + PyDict_SetItemString(d,"CURSOR_LEFT_BUTTON", SWIG_PyObj_FromInt((int)wxCURSOR_LEFT_BUTTON)); + PyDict_SetItemString(d,"CURSOR_MAGNIFIER", SWIG_PyObj_FromInt((int)wxCURSOR_MAGNIFIER)); + PyDict_SetItemString(d,"CURSOR_MIDDLE_BUTTON", SWIG_PyObj_FromInt((int)wxCURSOR_MIDDLE_BUTTON)); + PyDict_SetItemString(d,"CURSOR_NO_ENTRY", SWIG_PyObj_FromInt((int)wxCURSOR_NO_ENTRY)); + PyDict_SetItemString(d,"CURSOR_PAINT_BRUSH", SWIG_PyObj_FromInt((int)wxCURSOR_PAINT_BRUSH)); + PyDict_SetItemString(d,"CURSOR_PENCIL", SWIG_PyObj_FromInt((int)wxCURSOR_PENCIL)); + PyDict_SetItemString(d,"CURSOR_POINT_LEFT", SWIG_PyObj_FromInt((int)wxCURSOR_POINT_LEFT)); + PyDict_SetItemString(d,"CURSOR_POINT_RIGHT", SWIG_PyObj_FromInt((int)wxCURSOR_POINT_RIGHT)); + PyDict_SetItemString(d,"CURSOR_QUESTION_ARROW", SWIG_PyObj_FromInt((int)wxCURSOR_QUESTION_ARROW)); + PyDict_SetItemString(d,"CURSOR_RIGHT_BUTTON", SWIG_PyObj_FromInt((int)wxCURSOR_RIGHT_BUTTON)); + PyDict_SetItemString(d,"CURSOR_SIZENESW", SWIG_PyObj_FromInt((int)wxCURSOR_SIZENESW)); + PyDict_SetItemString(d,"CURSOR_SIZENS", SWIG_PyObj_FromInt((int)wxCURSOR_SIZENS)); + PyDict_SetItemString(d,"CURSOR_SIZENWSE", SWIG_PyObj_FromInt((int)wxCURSOR_SIZENWSE)); + PyDict_SetItemString(d,"CURSOR_SIZEWE", SWIG_PyObj_FromInt((int)wxCURSOR_SIZEWE)); + PyDict_SetItemString(d,"CURSOR_SIZING", SWIG_PyObj_FromInt((int)wxCURSOR_SIZING)); + PyDict_SetItemString(d,"CURSOR_SPRAYCAN", SWIG_PyObj_FromInt((int)wxCURSOR_SPRAYCAN)); + PyDict_SetItemString(d,"CURSOR_WAIT", SWIG_PyObj_FromInt((int)wxCURSOR_WAIT)); + PyDict_SetItemString(d,"CURSOR_WATCH", SWIG_PyObj_FromInt((int)wxCURSOR_WATCH)); + PyDict_SetItemString(d,"CURSOR_BLANK", SWIG_PyObj_FromInt((int)wxCURSOR_BLANK)); + PyDict_SetItemString(d,"CURSOR_DEFAULT", SWIG_PyObj_FromInt((int)wxCURSOR_DEFAULT)); + PyDict_SetItemString(d,"CURSOR_COPY_ARROW", SWIG_PyObj_FromInt((int)wxCURSOR_COPY_ARROW)); + PyDict_SetItemString(d,"CURSOR_ARROWWAIT", SWIG_PyObj_FromInt((int)wxCURSOR_ARROWWAIT)); + PyDict_SetItemString(d,"CURSOR_MAX", SWIG_PyObj_FromInt((int)wxCURSOR_MAX)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set); + PyDict_SetItemString(d,"FromStart", SWIG_PyObj_FromInt((int)wxFromStart)); + PyDict_SetItemString(d,"FromCurrent", SWIG_PyObj_FromInt((int)wxFromCurrent)); + PyDict_SetItemString(d,"FromEnd", SWIG_PyObj_FromInt((int)wxFromEnd)); wxPyPtrTypeMap_Add("wxInputStream", "wxPyInputStream"); @@ -39223,6 +41487,19 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_CUR_HOTSPOT_Y",_wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_get, _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTION",_wrap_IMAGE_OPTION_RESOLUTION_get, _wrap_IMAGE_OPTION_RESOLUTION_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTIONUNIT",_wrap_IMAGE_OPTION_RESOLUTIONUNIT_get, _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set); + PyDict_SetItemString(d,"IMAGE_RESOLUTION_INCHES", SWIG_PyObj_FromInt((int)wxIMAGE_RESOLUTION_INCHES)); + PyDict_SetItemString(d,"IMAGE_RESOLUTION_CM", SWIG_PyObj_FromInt((int)wxIMAGE_RESOLUTION_CM)); + PyDict_SetItemString(d,"BMP_24BPP", SWIG_PyObj_FromInt((int)wxBMP_24BPP)); + PyDict_SetItemString(d,"BMP_8BPP", SWIG_PyObj_FromInt((int)wxBMP_8BPP)); + PyDict_SetItemString(d,"BMP_8BPP_GREY", SWIG_PyObj_FromInt((int)wxBMP_8BPP_GREY)); + PyDict_SetItemString(d,"BMP_8BPP_GRAY", SWIG_PyObj_FromInt((int)wxBMP_8BPP_GRAY)); + PyDict_SetItemString(d,"BMP_8BPP_RED", SWIG_PyObj_FromInt((int)wxBMP_8BPP_RED)); + PyDict_SetItemString(d,"BMP_8BPP_PALETTE", SWIG_PyObj_FromInt((int)wxBMP_8BPP_PALETTE)); + PyDict_SetItemString(d,"BMP_4BPP", SWIG_PyObj_FromInt((int)wxBMP_4BPP)); + PyDict_SetItemString(d,"BMP_1BPP", SWIG_PyObj_FromInt((int)wxBMP_1BPP)); + PyDict_SetItemString(d,"BMP_1BPP_BW", SWIG_PyObj_FromInt((int)wxBMP_1BPP_BW)); + PyDict_SetItemString(d,"EVENT_PROPAGATE_NONE", SWIG_PyObj_FromInt((int)wxEVENT_PROPAGATE_NONE)); + PyDict_SetItemString(d,"EVENT_PROPAGATE_MAX", SWIG_PyObj_FromInt((int)wxEVENT_PROPAGATE_MAX)); PyDict_SetItemString(d, "wxEVT_NULL", PyInt_FromLong(wxEVT_NULL)); PyDict_SetItemString(d, "wxEVT_FIRST", PyInt_FromLong(wxEVT_FIRST)); PyDict_SetItemString(d, "wxEVT_USER_FIRST", PyInt_FromLong(wxEVT_USER_FIRST)); @@ -39337,11 +41614,48 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_SET_FOCUS", PyInt_FromLong(wxEVT_COMMAND_SET_FOCUS)); PyDict_SetItemString(d, "wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong(wxEVT_COMMAND_KILL_FOCUS)); PyDict_SetItemString(d, "wxEVT_COMMAND_ENTER", PyInt_FromLong(wxEVT_COMMAND_ENTER)); + PyDict_SetItemString(d,"MOUSE_BTN_ANY", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_ANY)); + PyDict_SetItemString(d,"MOUSE_BTN_NONE", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_NONE)); + PyDict_SetItemString(d,"MOUSE_BTN_LEFT", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_LEFT)); + PyDict_SetItemString(d,"MOUSE_BTN_MIDDLE", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_MIDDLE)); + PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_PyObj_FromInt((int)wxMOUSE_BTN_RIGHT)); + PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_PyObj_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); + PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_PyObj_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_PyObj_FromInt((int)wxIDLE_PROCESS_ALL)); + PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_PyObj_FromInt((int)wxIDLE_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_PyObj_FromInt((int)wxPYAPP_ASSERT_SUPPRESS)); + PyDict_SetItemString(d,"PYAPP_ASSERT_EXCEPTION", SWIG_PyObj_FromInt((int)wxPYAPP_ASSERT_EXCEPTION)); + PyDict_SetItemString(d,"PYAPP_ASSERT_DIALOG", SWIG_PyObj_FromInt((int)wxPYAPP_ASSERT_DIALOG)); + PyDict_SetItemString(d,"PYAPP_ASSERT_LOG", SWIG_PyObj_FromInt((int)wxPYAPP_ASSERT_LOG)); + PyDict_SetItemString(d,"PRINT_WINDOWS", SWIG_PyObj_FromInt((int)wxPRINT_WINDOWS)); + PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_PyObj_FromInt((int)wxPRINT_POSTSCRIPT)); SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set); SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set); SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set); + PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_PyObj_FromInt((int)wxFLEX_GROWMODE_NONE)); + PyDict_SetItemString(d,"FLEX_GROWMODE_SPECIFIED", SWIG_PyObj_FromInt((int)wxFLEX_GROWMODE_SPECIFIED)); + PyDict_SetItemString(d,"FLEX_GROWMODE_ALL", SWIG_PyObj_FromInt((int)wxFLEX_GROWMODE_ALL)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set); + PyDict_SetItemString(d,"Left", SWIG_PyObj_FromInt((int)wxLeft)); + PyDict_SetItemString(d,"Top", SWIG_PyObj_FromInt((int)wxTop)); + PyDict_SetItemString(d,"Right", SWIG_PyObj_FromInt((int)wxRight)); + PyDict_SetItemString(d,"Bottom", SWIG_PyObj_FromInt((int)wxBottom)); + PyDict_SetItemString(d,"Width", SWIG_PyObj_FromInt((int)wxWidth)); + PyDict_SetItemString(d,"Height", SWIG_PyObj_FromInt((int)wxHeight)); + PyDict_SetItemString(d,"Centre", SWIG_PyObj_FromInt((int)wxCentre)); + PyDict_SetItemString(d,"Center", SWIG_PyObj_FromInt((int)wxCenter)); + PyDict_SetItemString(d,"CentreX", SWIG_PyObj_FromInt((int)wxCentreX)); + PyDict_SetItemString(d,"CentreY", SWIG_PyObj_FromInt((int)wxCentreY)); + PyDict_SetItemString(d,"Unconstrained", SWIG_PyObj_FromInt((int)wxUnconstrained)); + PyDict_SetItemString(d,"AsIs", SWIG_PyObj_FromInt((int)wxAsIs)); + PyDict_SetItemString(d,"PercentOf", SWIG_PyObj_FromInt((int)wxPercentOf)); + PyDict_SetItemString(d,"Above", SWIG_PyObj_FromInt((int)wxAbove)); + PyDict_SetItemString(d,"Below", SWIG_PyObj_FromInt((int)wxBelow)); + PyDict_SetItemString(d,"LeftOf", SWIG_PyObj_FromInt((int)wxLeftOf)); + PyDict_SetItemString(d,"RightOf", SWIG_PyObj_FromInt((int)wxRightOf)); + PyDict_SetItemString(d,"SameAs", SWIG_PyObj_FromInt((int)wxSameAs)); + PyDict_SetItemString(d,"Absolute", SWIG_PyObj_FromInt((int)wxAbsolute)); // Initialize threading, some globals and such __wxPyPreStart(d); diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py index 142e4bac19..f7fce7ed2d 100644 --- a/wxPython/src/msw/gdi.py +++ b/wxPython/src/msw/gdi.py @@ -126,6 +126,10 @@ def ColourRGB(*args, **kwargs): val.thisown = 1 return val +Color = Colour +NamedColor = NamedColour +ColorRGB = ColourRGB + class Palette(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -3521,6 +3525,49 @@ class PenListPtr(PenList): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = PenList _gdi.PenList_swigregister(PenListPtr) +cvar = _gdi.cvar +NORMAL_FONT = cvar.NORMAL_FONT +SMALL_FONT = cvar.SMALL_FONT +ITALIC_FONT = cvar.ITALIC_FONT +SWISS_FONT = cvar.SWISS_FONT +RED_PEN = cvar.RED_PEN +CYAN_PEN = cvar.CYAN_PEN +GREEN_PEN = cvar.GREEN_PEN +BLACK_PEN = cvar.BLACK_PEN +WHITE_PEN = cvar.WHITE_PEN +TRANSPARENT_PEN = cvar.TRANSPARENT_PEN +BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN +GREY_PEN = cvar.GREY_PEN +MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN +LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN +BLUE_BRUSH = cvar.BLUE_BRUSH +GREEN_BRUSH = cvar.GREEN_BRUSH +WHITE_BRUSH = cvar.WHITE_BRUSH +BLACK_BRUSH = cvar.BLACK_BRUSH +TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH +CYAN_BRUSH = cvar.CYAN_BRUSH +RED_BRUSH = cvar.RED_BRUSH +GREY_BRUSH = cvar.GREY_BRUSH +MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH +LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH +BLACK = cvar.BLACK +WHITE = cvar.WHITE +RED = cvar.RED +BLUE = cvar.BLUE +GREEN = cvar.GREEN +CYAN = cvar.CYAN +LIGHT_GREY = cvar.LIGHT_GREY +STANDARD_CURSOR = cvar.STANDARD_CURSOR +HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR +CROSS_CURSOR = cvar.CROSS_CURSOR +NullBitmap = cvar.NullBitmap +NullIcon = cvar.NullIcon +NullCursor = cvar.NullCursor +NullPen = cvar.NullPen +NullBrush = cvar.NullBrush +NullPalette = cvar.NullPalette +NullFont = cvar.NullFont +NullColour = cvar.NullColour class BrushList(core.Object): def __init__(self): raise RuntimeError, "No constructor defined" @@ -3624,6 +3671,7 @@ _gdi.FontList_swigregister(FontListPtr) #--------------------------------------------------------------------------- +NullColor = NullColour #--------------------------------------------------------------------------- class Effects(core.Object): @@ -3697,49 +3745,6 @@ class EffectsPtr(Effects): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = Effects _gdi.Effects_swigregister(EffectsPtr) -cvar = _gdi.cvar -NORMAL_FONT = cvar.NORMAL_FONT -SMALL_FONT = cvar.SMALL_FONT -ITALIC_FONT = cvar.ITALIC_FONT -SWISS_FONT = cvar.SWISS_FONT -RED_PEN = cvar.RED_PEN -CYAN_PEN = cvar.CYAN_PEN -GREEN_PEN = cvar.GREEN_PEN -BLACK_PEN = cvar.BLACK_PEN -WHITE_PEN = cvar.WHITE_PEN -TRANSPARENT_PEN = cvar.TRANSPARENT_PEN -BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN -GREY_PEN = cvar.GREY_PEN -MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN -LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN -BLUE_BRUSH = cvar.BLUE_BRUSH -GREEN_BRUSH = cvar.GREEN_BRUSH -WHITE_BRUSH = cvar.WHITE_BRUSH -BLACK_BRUSH = cvar.BLACK_BRUSH -TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH -CYAN_BRUSH = cvar.CYAN_BRUSH -RED_BRUSH = cvar.RED_BRUSH -GREY_BRUSH = cvar.GREY_BRUSH -MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH -LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH -BLACK = cvar.BLACK -WHITE = cvar.WHITE -RED = cvar.RED -BLUE = cvar.BLUE -GREEN = cvar.GREEN -CYAN = cvar.CYAN -LIGHT_GREY = cvar.LIGHT_GREY -STANDARD_CURSOR = cvar.STANDARD_CURSOR -HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR -CROSS_CURSOR = cvar.CROSS_CURSOR -NullBitmap = cvar.NullBitmap -NullIcon = cvar.NullIcon -NullCursor = cvar.NullCursor -NullPen = cvar.NullPen -NullBrush = cvar.NullBrush -NullPalette = cvar.NullPalette -NullFont = cvar.NullFont -NullColour = cvar.NullColour TheFontList = cvar.TheFontList ThePenList = cvar.ThePenList TheBrushList = cvar.TheBrushList diff --git a/wxPython/src/msw/gdi_wrap.cpp b/wxPython/src/msw/gdi_wrap.cpp index 82fe48d550..a667d0638d 100644 --- a/wxPython/src/msw/gdi_wrap.cpp +++ b/wxPython/src/msw/gdi_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -388,55 +237,56 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxMirrorDC swig_types[4] #define SWIGTYPE_p_byte swig_types[5] #define SWIGTYPE_p_wxPyFontEnumerator swig_types[6] -#define SWIGTYPE_p_wxIconLocation swig_types[7] -#define SWIGTYPE_p_wxImage swig_types[8] -#define SWIGTYPE_p_wxMetaFileDC swig_types[9] -#define SWIGTYPE_p_wxMask swig_types[10] -#define SWIGTYPE_p_wxFont swig_types[11] -#define SWIGTYPE_p_wxWindow swig_types[12] -#define SWIGTYPE_p_wxSize swig_types[13] -#define SWIGTYPE_p_double swig_types[14] -#define SWIGTYPE_p_wxMemoryDC swig_types[15] -#define SWIGTYPE_p_wxFontMapper swig_types[16] -#define SWIGTYPE_p_wxEffects swig_types[17] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[18] -#define SWIGTYPE_p_wxPalette swig_types[19] -#define SWIGTYPE_p_wxBitmap swig_types[20] -#define SWIGTYPE_p_wxObject swig_types[21] -#define SWIGTYPE_p_wxRegionIterator swig_types[22] -#define SWIGTYPE_p_wxRect swig_types[23] -#define SWIGTYPE_p_wxString swig_types[24] -#define SWIGTYPE_p_wxPrinterDC swig_types[25] -#define SWIGTYPE_p_wxIconBundle swig_types[26] -#define SWIGTYPE_p_wxPoint swig_types[27] -#define SWIGTYPE_p_wxDash swig_types[28] -#define SWIGTYPE_p_wxScreenDC swig_types[29] -#define SWIGTYPE_p_wxCursor swig_types[30] -#define SWIGTYPE_p_wxClientDC swig_types[31] -#define SWIGTYPE_p_wxBufferedDC swig_types[32] -#define SWIGTYPE_p_wxImageList swig_types[33] -#define SWIGTYPE_p_unsigned_char swig_types[34] -#define SWIGTYPE_p_wxGDIObject swig_types[35] -#define SWIGTYPE_p_wxLocale swig_types[36] +#define SWIGTYPE_p_char swig_types[7] +#define SWIGTYPE_p_wxIconLocation swig_types[8] +#define SWIGTYPE_p_wxImage swig_types[9] +#define SWIGTYPE_p_wxMetaFileDC swig_types[10] +#define SWIGTYPE_p_wxMask swig_types[11] +#define SWIGTYPE_p_wxFont swig_types[12] +#define SWIGTYPE_p_wxWindow swig_types[13] +#define SWIGTYPE_p_wxSize swig_types[14] +#define SWIGTYPE_p_double swig_types[15] +#define SWIGTYPE_p_wxMemoryDC swig_types[16] +#define SWIGTYPE_p_wxFontMapper swig_types[17] +#define SWIGTYPE_p_wxEffects swig_types[18] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[19] +#define SWIGTYPE_p_wxPalette swig_types[20] +#define SWIGTYPE_p_wxBitmap swig_types[21] +#define SWIGTYPE_p_wxObject swig_types[22] +#define SWIGTYPE_p_wxRegionIterator swig_types[23] +#define SWIGTYPE_p_wxRect swig_types[24] +#define SWIGTYPE_p_wxString swig_types[25] +#define SWIGTYPE_p_wxPrinterDC swig_types[26] +#define SWIGTYPE_p_wxIconBundle swig_types[27] +#define SWIGTYPE_p_wxPoint swig_types[28] +#define SWIGTYPE_p_wxDash swig_types[29] +#define SWIGTYPE_p_wxScreenDC swig_types[30] +#define SWIGTYPE_p_wxCursor swig_types[31] +#define SWIGTYPE_p_wxClientDC swig_types[32] +#define SWIGTYPE_p_wxBufferedDC swig_types[33] +#define SWIGTYPE_p_wxImageList swig_types[34] +#define SWIGTYPE_p_unsigned_char swig_types[35] +#define SWIGTYPE_p_wxGDIObject swig_types[36] #define SWIGTYPE_p_wxIcon swig_types[37] -#define SWIGTYPE_p_wxRegion swig_types[38] -#define SWIGTYPE_p_wxLanguageInfo swig_types[39] -#define SWIGTYPE_p_wxConfigBase swig_types[40] -#define SWIGTYPE_p_wxWindowDC swig_types[41] -#define SWIGTYPE_p_wxPrintData swig_types[42] -#define SWIGTYPE_p_wxBrushList swig_types[43] -#define SWIGTYPE_p_wxFontList swig_types[44] -#define SWIGTYPE_p_wxPen swig_types[45] -#define SWIGTYPE_p_wxBufferedPaintDC swig_types[46] -#define SWIGTYPE_p_wxPaintDC swig_types[47] -#define SWIGTYPE_p_wxPenList swig_types[48] -#define SWIGTYPE_p_wxPyPen swig_types[49] -#define SWIGTYPE_p_int swig_types[50] -#define SWIGTYPE_p_wxMetaFile swig_types[51] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[52] -#define SWIGTYPE_p_wxEncodingConverter swig_types[53] -#define SWIGTYPE_p_wxColourDatabase swig_types[54] -static swig_type_info *swig_types[56]; +#define SWIGTYPE_p_wxLocale swig_types[38] +#define SWIGTYPE_p_wxRegion swig_types[39] +#define SWIGTYPE_p_wxLanguageInfo swig_types[40] +#define SWIGTYPE_p_wxConfigBase swig_types[41] +#define SWIGTYPE_p_wxWindowDC swig_types[42] +#define SWIGTYPE_p_wxPrintData swig_types[43] +#define SWIGTYPE_p_wxBrushList swig_types[44] +#define SWIGTYPE_p_wxFontList swig_types[45] +#define SWIGTYPE_p_wxPen swig_types[46] +#define SWIGTYPE_p_wxBufferedPaintDC swig_types[47] +#define SWIGTYPE_p_wxPaintDC swig_types[48] +#define SWIGTYPE_p_wxPenList swig_types[49] +#define SWIGTYPE_p_wxPyPen swig_types[50] +#define SWIGTYPE_p_int swig_types[51] +#define SWIGTYPE_p_wxMetaFile swig_types[52] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[53] +#define SWIGTYPE_p_wxEncodingConverter swig_types[54] +#define SWIGTYPE_p_wxColourDatabase swig_types[55] +static swig_type_info *swig_types[57]; /* -------- TYPES TABLE (END) -------- */ @@ -448,11 +298,73 @@ static swig_type_info *swig_types[56]; #define SWIG_name "_gdi" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(unsigned char) +SWIG_PyObj_AsUnsignedChar(PyObject *obj) +{ + return numeric_cast(unsigned char, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned char", UCHAR_MAX)); +} + PyObject *wxColour_Get(wxColour *self){ PyObject* rv = PyTuple_New(3); int red = -1; @@ -469,6 +381,14 @@ PyObject *wxColour_Get(wxColour *self){ return rv; } +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -562,6 +482,13 @@ wxBitmap *new_wxBitmap(PyObject *bits,int width,int height,int depth){ PyString_AsStringAndSize(bits, &buf, &length); return new wxBitmap(buf, width, height, depth); } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + void wxBitmap_SetMaskColour(wxBitmap *self,wxColour const &colour){ wxMask *mask = new wxMask(*self, colour); self->SetMask(mask); @@ -646,6 +573,14 @@ wxString wxNativeFontInfo___str__(wxNativeFontInfo *self){ bool wxTestFontEncoding(const wxNativeEncodingInfo& info) { wxPyRaiseNotImplemented(); return False; } + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + PyObject *wxFontMapper_GetAltForEncoding(wxFontMapper *self,wxFontEncoding encoding,wxString const &facename,bool interactive){ wxFontEncoding alt_enc; if (self->GetAltForEncoding(encoding, &alt_enc, facename, interactive)) @@ -702,6 +637,22 @@ wxColour wxDC_GetPixel(wxDC *self,wxPoint const &pt){ self->GetPixel(pt, &col); return col; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + wxRect wxDC_DrawImageLabel(wxDC *self,wxString const &text,wxBitmap const &image,wxRect const &rect,int alignment,int indexAccel){ wxRect rv; self->DrawLabel(text, image, rect, alignment, indexAccel, &rv); @@ -819,7 +770,7 @@ static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -839,7 +790,7 @@ static PyObject *_wrap_GDIObject_SetVisible(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GDIObject_SetVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGDIObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -874,7 +825,7 @@ static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -904,19 +855,19 @@ static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Colour",kwnames,&obj0,&obj1,&obj2)) goto fail; if (obj0) { { - arg1 = (unsigned char) SPyObj_AsUnsignedChar(obj0); + arg1 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj0); if (PyErr_Occurred()) SWIG_fail; } } if (obj1) { { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -1007,7 +958,7 @@ static PyObject *_wrap_new_ColourRGB(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ColourRGB",kwnames,&obj0)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -1042,7 +993,7 @@ static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -1067,7 +1018,7 @@ static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -1092,7 +1043,7 @@ static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -1117,7 +1068,7 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1141,15 +1092,15 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Colour_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned char) SPyObj_AsUnsignedChar(obj1); + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (unsigned char) SPyObj_AsUnsignedChar(obj2); + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (unsigned char) SPyObj_AsUnsignedChar(obj3); + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -1179,7 +1130,7 @@ static PyObject *_wrap_Colour_SetRGB(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetRGB",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (unsigned long) SPyObj_AsUnsignedLong(obj1); + arg2 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -1221,7 +1172,7 @@ static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1253,7 +1204,7 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1339,6 +1290,7 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa unsigned char *arg3 = (unsigned char *) 0 ; unsigned char *arg4 = (unsigned char *) 0 ; wxPalette *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -1346,7 +1298,11 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa (char *) "n",(char *) "red",(char *) "green",(char *) "blue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iOOO:new_Palette",kwnames,&arg1,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_Palette",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -1406,15 +1362,15 @@ static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Palette_GetPixel",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (byte) SPyObj_AsUnsignedChar(obj1); + arg2 = (byte) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (byte) SPyObj_AsUnsignedChar(obj2); + arg3 = (byte) SWIG_PyObj_AsUnsignedChar(obj2); if (PyErr_Occurred()) SWIG_fail; } { - arg4 = (byte) SPyObj_AsUnsignedChar(obj3); + arg4 = (byte) SWIG_PyObj_AsUnsignedChar(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -1424,7 +1380,7 @@ static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1443,6 +1399,7 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * byte temp4 ; byte temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pixel", NULL }; @@ -1450,8 +1407,12 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * arg3 = &temp3; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Palette_GetRGB",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Palette_GetRGB",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetRGB(arg2,arg3,arg4,arg5); @@ -1459,7 +1420,7 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -1496,7 +1457,7 @@ static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1518,15 +1479,29 @@ static PyObject *_wrap_new_Pen(PyObject *self, PyObject *args, PyObject *kwargs) wxPen *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "width",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:new_Pen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_Pen",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPen *)new wxPen(*arg1,arg2,arg3); @@ -1583,7 +1558,7 @@ static PyObject *_wrap_Pen_GetCap(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1637,7 +1612,7 @@ static PyObject *_wrap_Pen_GetJoin(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1662,7 +1637,7 @@ static PyObject *_wrap_Pen_GetStyle(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1687,7 +1662,7 @@ static PyObject *_wrap_Pen_GetWidth(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1712,7 +1687,7 @@ static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1724,12 +1699,17 @@ static PyObject *_wrap_Pen_SetCap(PyObject *self, PyObject *args, PyObject *kwar wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cap_style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetCap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetCap",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCap(arg2); @@ -1780,12 +1760,17 @@ static PyObject *_wrap_Pen_SetJoin(PyObject *self, PyObject *args, PyObject *kwa wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "join_style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetJoin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetJoin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetJoin(arg2); @@ -1805,12 +1790,17 @@ static PyObject *_wrap_Pen_SetStyle(PyObject *self, PyObject *args, PyObject *kw wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -1830,12 +1820,17 @@ static PyObject *_wrap_Pen_SetWidth(PyObject *self, PyObject *args, PyObject *kw wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -1931,7 +1926,7 @@ static PyObject *_wrap_Pen_GetDashCount(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2008,15 +2003,29 @@ static PyObject *_wrap_new_PyPen(PyObject *self, PyObject *args, PyObject *kwarg wxPyPen *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "width",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:new_PyPen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_PyPen",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyPen *)new wxPyPen(*arg1,arg2,arg3); @@ -2107,15 +2116,22 @@ static PyObject *_wrap_new_Brush(PyObject *self, PyObject *args, PyObject *kwarg wxBrush *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_Brush",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Brush",kwnames,&obj0,&obj1)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBrush *)new wxBrush((wxColour const &)*arg1,arg2); @@ -2190,12 +2206,17 @@ static PyObject *_wrap_Brush_SetStyle(PyObject *self, PyObject *args, PyObject * wxBrush *arg1 = (wxBrush *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Brush_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -2287,7 +2308,7 @@ static PyObject *_wrap_Brush_GetStyle(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2337,7 +2358,7 @@ static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2358,16 +2379,23 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar wxBitmap *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_Bitmap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Bitmap",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (wxBitmapType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new wxBitmap((wxString const &)*arg1,(wxBitmapType )arg2); @@ -2420,11 +2448,28 @@ static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 = (int) -1 ; wxBitmap *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|i:new_EmptyBitmap",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_EmptyBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new wxBitmap(arg1,arg2,arg3); @@ -2473,15 +2518,22 @@ static PyObject *_wrap_new_BitmapFromImage(PyObject *self, PyObject *args, PyObj int arg2 = (int) -1 ; wxBitmap *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "image",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_BitmapFromImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BitmapFromImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new wxBitmap((wxImage const &)*arg1,arg2); @@ -2529,12 +2581,29 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje int arg4 = (int) 1 ; wxBitmap *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "bits",(char *) "width",(char *) "height",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:new_BitmapFromBits",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:new_BitmapFromBits",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; arg1 = obj0; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new_wxBitmap(arg1,arg2,arg3,arg4); @@ -2597,7 +2666,7 @@ static PyObject *_wrap_Bitmap_GetHandle(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -2609,12 +2678,17 @@ static PyObject *_wrap_Bitmap_SetHandle(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "handle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Bitmap_SetHandle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetHandle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandle(arg2); @@ -2647,7 +2721,7 @@ static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2672,7 +2746,7 @@ static PyObject *_wrap_Bitmap_GetWidth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2697,7 +2771,7 @@ static PyObject *_wrap_Bitmap_GetHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2722,7 +2796,7 @@ static PyObject *_wrap_Bitmap_GetDepth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2887,18 +2961,23 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|O:Bitmap_SaveFile",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Bitmap_SaveFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (wxBitmapType) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -2909,7 +2988,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -2933,17 +3012,22 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Bitmap_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Bitmap_LoadFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (wxBitmapType) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3); @@ -2951,7 +3035,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -2990,7 +3074,7 @@ static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3002,12 +3086,17 @@ static PyObject *_wrap_Bitmap_SetHeight(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -3027,12 +3116,17 @@ static PyObject *_wrap_Bitmap_SetWidth(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -3052,12 +3146,17 @@ static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetDepth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetDepth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDepth(arg2); @@ -3096,7 +3195,7 @@ static PyObject *_wrap_Bitmap_CopyFromCursor(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3121,7 +3220,7 @@ static PyObject *_wrap_Bitmap_GetQuality(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3133,15 +3232,20 @@ static PyObject *_wrap_Bitmap_SetQuality(PyObject *self, PyObject *args, PyObjec wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "q", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetQuality",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetQuality",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetQuality(arg2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetQuality(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3239,16 +3343,35 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs wxIcon *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Icon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + { + arg2 = (wxBitmapType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4); @@ -3407,17 +3530,22 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Icon_LoadFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (wxBitmapType) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3); @@ -3425,7 +3553,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -3458,7 +3586,7 @@ static PyObject *_wrap_Icon_GetHandle(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -3470,12 +3598,17 @@ static PyObject *_wrap_Icon_SetHandle(PyObject *self, PyObject *args, PyObject * wxIcon *arg1 = (wxIcon *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "handle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Icon_SetHandle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHandle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandle(arg2); @@ -3508,7 +3641,7 @@ static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3533,7 +3666,7 @@ static PyObject *_wrap_Icon_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3558,7 +3691,7 @@ static PyObject *_wrap_Icon_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3583,7 +3716,7 @@ static PyObject *_wrap_Icon_GetDepth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3595,12 +3728,17 @@ static PyObject *_wrap_Icon_SetWidth(PyObject *self, PyObject *args, PyObject *k wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -3620,12 +3758,17 @@ static PyObject *_wrap_Icon_SetHeight(PyObject *self, PyObject *args, PyObject * wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -3645,12 +3788,17 @@ static PyObject *_wrap_Icon_SetDepth(PyObject *self, PyObject *args, PyObject *k wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "d", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetDepth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetDepth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDepth(arg2); @@ -3740,11 +3888,12 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject wxIconLocation *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "num", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_IconLocation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconLocation",kwnames,&obj0,&obj1)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -3752,6 +3901,12 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject temp1 = True; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxIconLocation *)new_wxIconLocation((wxString const *)arg1,arg2); @@ -3816,7 +3971,7 @@ static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3902,12 +4057,17 @@ static PyObject *_wrap_IconLocation_SetIndex(PyObject *self, PyObject *args, PyO wxIconLocation *arg1 = (wxIconLocation *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "num", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IconLocation_SetIndex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetIndex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxIconLocation_SetIndex(arg1,arg2); @@ -3940,7 +4100,7 @@ static PyObject *_wrap_IconLocation_GetIndex(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3983,16 +4143,21 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py wxIconBundle *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "file",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_IconBundleFromFile",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_IconBundleFromFile",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxIconBundle *)new wxIconBundle((wxString const &)*arg1,arg2); @@ -4105,17 +4270,22 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "file",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconBundle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AddIcon((wxString const &)*arg2,arg3); @@ -4189,16 +4359,35 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar wxCursor *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "cursorName",(char *) "flags",(char *) "hotSpotX",(char *) "hotSpotY", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Cursor",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Cursor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4); @@ -4249,11 +4438,16 @@ static PyObject *_wrap_new_StockCursor(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 ; wxCursor *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:new_StockCursor",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_StockCursor",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCursor *)new wxCursor(arg1); @@ -4306,13 +4500,37 @@ static PyObject *_wrap_new_CursorFromBits(PyObject *self, PyObject *args, PyObje PyObject *arg6 = (PyObject *) 0 ; wxCursor *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "bits",(char *) "width",(char *) "height",(char *) "hotSpotX",(char *) "hotSpotY",(char *) "maskBits", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiO:new_CursorFromBits",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:new_CursorFromBits",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; arg1 = obj0; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { arg6 = obj5; } @@ -4348,7 +4566,7 @@ static PyObject *_wrap_Cursor_GetHandle(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4360,12 +4578,17 @@ static PyObject *_wrap_Cursor_SetHandle(PyObject *self, PyObject *args, PyObject wxCursor *arg1 = (wxCursor *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "handle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Cursor_SetHandle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetHandle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandle(arg2); @@ -4398,7 +4621,7 @@ static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4423,7 +4646,7 @@ static PyObject *_wrap_Cursor_GetWidth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4448,7 +4671,7 @@ static PyObject *_wrap_Cursor_GetHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4473,7 +4696,7 @@ static PyObject *_wrap_Cursor_GetDepth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4485,12 +4708,17 @@ static PyObject *_wrap_Cursor_SetWidth(PyObject *self, PyObject *args, PyObject wxCursor *arg1 = (wxCursor *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Cursor_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -4510,12 +4738,17 @@ static PyObject *_wrap_Cursor_SetHeight(PyObject *self, PyObject *args, PyObject wxCursor *arg1 = (wxCursor *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Cursor_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -4535,12 +4768,17 @@ static PyObject *_wrap_Cursor_SetDepth(PyObject *self, PyObject *args, PyObject wxCursor *arg1 = (wxCursor *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "d", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Cursor_SetDepth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetDepth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDepth(arg2); @@ -4600,11 +4838,39 @@ static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwar int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxRegion *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_Region",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Region",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new wxRegion(arg1,arg2,arg3,arg4); @@ -4629,11 +4895,12 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb wxColour temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|Oi:new_RegionFromBitmap",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_RegionFromBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4644,6 +4911,12 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; } } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1,(wxColour const &)*arg2,arg3); @@ -4665,15 +4938,22 @@ static PyObject *_wrap_new_RegionFromPoints(PyObject *self, PyObject *args, PyOb int arg3 = (int) wxWINDING_RULE ; wxRegion *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "points",(char *) "fillStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_RegionFromPoints",kwnames,&obj0,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_RegionFromPoints",kwnames,&obj0,&obj1)) goto fail; { arg2 = wxPoint_LIST_helper(obj0, &arg1); if (arg2 == NULL) SWIG_fail; } + if (obj1) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new wxRegion(arg1,arg2,arg3); @@ -4749,12 +5029,22 @@ static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *k int arg3 ; bool 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 *)"Oii:Region_Offset",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Offset",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Offset(arg2,arg3); @@ -4762,7 +5052,7 @@ static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4776,12 +5066,22 @@ static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject int 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 *)"Oii:Region_Contains",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Contains",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->Contains(arg2,arg3); @@ -4789,7 +5089,7 @@ static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4821,7 +5121,7 @@ static PyObject *_wrap_Region_ContainsPoint(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4853,7 +5153,7 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4869,12 +5169,32 @@ static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, Py int arg5 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_ContainsRectDim",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_ContainsRectDim",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->Contains(arg2,arg3,arg4,arg5); @@ -4882,7 +5202,7 @@ static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4927,12 +5247,32 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject int arg5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Intersect",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Intersect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Intersect(arg2,arg3,arg4,arg5); @@ -4940,7 +5280,7 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4972,7 +5312,7 @@ static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5003,7 +5343,7 @@ static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5028,7 +5368,7 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5044,12 +5384,32 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw int arg5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Union",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Union",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Union(arg2,arg3,arg4,arg5); @@ -5057,7 +5417,7 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5089,7 +5449,7 @@ static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5120,7 +5480,7 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5136,12 +5496,32 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject int arg5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Subtract",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Subtract",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Subtract(arg2,arg3,arg4,arg5); @@ -5149,7 +5529,7 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5181,7 +5561,7 @@ static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5212,7 +5592,7 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5228,12 +5608,32 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar int arg5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Xor",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Xor",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Xor(arg2,arg3,arg4,arg5); @@ -5241,7 +5641,7 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5273,7 +5673,7 @@ static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5304,7 +5704,7 @@ static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5352,11 +5752,12 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|Oi:Region_UnionBitmap",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Region_UnionBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,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) { @@ -5368,6 +5769,12 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Union((wxBitmap const &)*arg2,(wxColour const &)*arg3,arg4); @@ -5375,7 +5782,7 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5459,7 +5866,7 @@ static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5484,7 +5891,7 @@ static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5509,7 +5916,7 @@ static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5534,7 +5941,7 @@ static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5559,7 +5966,7 @@ static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5584,7 +5991,7 @@ static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5638,7 +6045,7 @@ static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5711,7 +6118,7 @@ static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5843,7 +6250,7 @@ static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5868,7 +6275,7 @@ static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5893,7 +6300,7 @@ static PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5918,7 +6325,7 @@ static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5974,7 +6381,7 @@ static PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5999,7 +6406,7 @@ static PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6011,15 +6418,20 @@ static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *self, PyObject *arg wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pointsize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetPointSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPointSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPointSize(arg2); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPointSize(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -6036,12 +6448,17 @@ static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *self, PyObject *args, P wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontStyle) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle((wxFontStyle )arg2); @@ -6061,12 +6478,17 @@ static PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *self, PyObject *args, wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetWeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetWeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontWeight) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWeight((wxFontWeight )arg2); @@ -6094,7 +6516,7 @@ static PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetUnderlined",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -6148,12 +6570,17 @@ static PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *self, PyObject *args, wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "family", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetFamily",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFamily",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontFamily) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFamily((wxFontFamily )arg2); @@ -6173,12 +6600,17 @@ static PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *self, PyObject *args wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetEncoding",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetEncoding",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEncoding((wxFontEncoding )arg2); @@ -6219,7 +6651,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6322,7 +6754,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6441,12 +6873,17 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *self, PyObject wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeEncodingInfo_encoding_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_encoding_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->encoding = (wxFontEncoding )arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -6469,7 +6906,7 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->encoding); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6548,7 +6985,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6605,11 +7042,16 @@ static PyObject *_wrap_GetNativeFontEncoding(PyObject *self, PyObject *args, PyO PyObject *resultobj; int arg1 ; wxNativeEncodingInfo *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetNativeFontEncoding",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetNativeFontEncoding",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNativeEncodingInfo *)wxGetNativeFontEncoding((wxFontEncoding )arg1); @@ -6645,7 +7087,7 @@ static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6768,7 +7210,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6779,7 +7221,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -6809,7 +7251,7 @@ static PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -6827,7 +7269,7 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncoding",kwnames,&obj0)) goto fail; { - arg1 = (size_t) SPyObj_AsUnsignedLong(obj0); + arg1 = (size_t) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -6837,7 +7279,7 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6848,11 +7290,16 @@ static PyObject *_wrap_FontMapper_GetEncodingName(PyObject *self, PyObject *args PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:FontMapper_GetEncodingName",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingName",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxFontMapper::GetEncodingName((wxFontEncoding )arg1); @@ -6877,11 +7324,16 @@ static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *self, PyObjec PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:FontMapper_GetEncodingDescription",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingDescription",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxFontMapper::GetEncodingDescription((wxFontEncoding )arg1); @@ -7007,14 +7459,19 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar PyObject *result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "facename",(char *) "interactive", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -7024,7 +7481,7 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7059,13 +7516,18 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * bool result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "facename", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -7080,7 +7542,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -7181,16 +7643,37 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs int arg7 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; bool temp6 = 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 *) "pointSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "face",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiii|OOi:new_Font",kwnames,&arg1,&arg2,&arg3,&arg4,&obj4,&obj5,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_Font",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } } @@ -7201,6 +7684,12 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs temp6 = True; } } + if (obj6) { + { + arg7 = (wxFontEncoding) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFont *)new wxFont(arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,(wxFontEncoding )arg7); @@ -7323,12 +7812,30 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg int arg5 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; bool temp4 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|iOi:new_Font2",kwnames,&arg1,&arg2,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_Font2",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxFontFamily) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -7336,6 +7843,12 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg temp4 = True; } } + if (obj4) { + { + arg5 = (wxFontEncoding) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFont *)new_wxFont(arg1,(wxFontFamily )arg2,arg3,(wxString const &)*arg4,(wxFontEncoding )arg5); @@ -7376,7 +7889,7 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7407,7 +7920,7 @@ static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7438,7 +7951,7 @@ static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7463,7 +7976,7 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7488,7 +8001,7 @@ static PyObject *_wrap_Font_GetFamily(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7513,7 +8026,7 @@ static PyObject *_wrap_Font_GetStyle(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7538,7 +8051,7 @@ static PyObject *_wrap_Font_GetWeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7563,7 +8076,7 @@ static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7619,7 +8132,7 @@ static PyObject *_wrap_Font_GetEncoding(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7669,7 +8182,7 @@ static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7743,12 +8256,17 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *self, PyObject *args, PyObjec wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pointSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetPointSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPointSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPointSize(arg2); @@ -7768,12 +8286,17 @@ static PyObject *_wrap_Font_SetFamily(PyObject *self, PyObject *args, PyObject * wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "family", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetFamily",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFamily",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFamily(arg2); @@ -7793,12 +8316,17 @@ static PyObject *_wrap_Font_SetStyle(PyObject *self, PyObject *args, PyObject *k wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -7818,12 +8346,17 @@ static PyObject *_wrap_Font_SetWeight(PyObject *self, PyObject *args, PyObject * wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetWeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetWeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWeight(arg2); @@ -7891,7 +8424,7 @@ static PyObject *_wrap_Font_SetUnderlined(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetUnderlined",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -7913,12 +8446,17 @@ static PyObject *_wrap_Font_SetEncoding(PyObject *self, PyObject *args, PyObject wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetEncoding",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetEncoding",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEncoding((wxFontEncoding )arg2); @@ -8150,7 +8688,7 @@ static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -8186,7 +8724,7 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8208,7 +8746,7 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8218,11 +8756,16 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Font_SetDefaultEncoding",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_SetDefaultEncoding",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFont::SetDefaultEncoding((wxFontEncoding )arg1); @@ -8309,7 +8852,7 @@ static PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *self, PyObject arg2 = obj1; arg3 = obj2; { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -8333,16 +8876,23 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec bool arg3 = (bool) False ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "fixedWidthOnly", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -8353,7 +8903,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8389,7 +8939,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8466,12 +9016,17 @@ static PyObject *_wrap_LanguageInfo_Language_set(PyObject *self, PyObject *args, wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "Language", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:LanguageInfo_Language_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Language_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->Language = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -8494,7 +9049,7 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->Language); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8635,11 +9190,25 @@ static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwar int arg1 = (int) wxLANGUAGE_DEFAULT ; int arg2 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ; wxLocale *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "language",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Locale",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Locale",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLocale *)new wxLocale(arg1,arg2); @@ -8725,13 +9294,13 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -8742,7 +9311,7 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8780,12 +9349,26 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw int arg3 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "language",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:Locale_Init2",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Locale_Init2",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Init(arg2,arg3); @@ -8793,7 +9376,7 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8815,7 +9398,7 @@ static PyObject *_wrap_Locale_GetSystemLanguage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8837,7 +9420,7 @@ static PyObject *_wrap_Locale_GetSystemEncoding(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8890,7 +9473,7 @@ static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8946,7 +9529,7 @@ static PyObject *_wrap_Locale_GetLanguage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9078,7 +9661,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9119,7 +9702,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9138,11 +9721,16 @@ static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 ; wxLanguageInfo *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "lang", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Locale_GetLanguageInfo",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageInfo",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLanguageInfo *)wxLocale::GetLanguageInfo(arg1); @@ -9161,11 +9749,16 @@ static PyObject *_wrap_Locale_GetLanguageName(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "lang", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Locale_GetLanguageName",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageName",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxLocale::GetLanguageName(arg1); @@ -9445,7 +10038,7 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) { temp2 = True; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -9531,7 +10124,7 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) { } if (_v) { { - SPyObj_AsUnsignedInt(argv[2]); + SWIG_PyObj_AsUnsignedLong(argv[2]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -9605,12 +10198,29 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py int arg4 = (int) wxCONVERT_STRICT ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "input_enc",(char *) "output_enc",(char *) "method", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:EncodingConverter_Init",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:EncodingConverter_Init",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEncodingConverter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (wxFontEncoding) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Init((wxFontEncoding )arg2,(wxFontEncoding )arg3,arg4); @@ -9618,7 +10228,7 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9677,11 +10287,23 @@ static PyObject *_wrap_EncodingConverter_GetPlatformEquivalents(PyObject *self, int arg1 ; int arg2 = (int) wxPLATFORM_CURRENT ; wxFontEncodingArray result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "enc",(char *) "platform", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:EncodingConverter_GetPlatformEquivalents",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:EncodingConverter_GetPlatformEquivalents",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxEncodingConverter::GetPlatformEquivalents((wxFontEncoding )arg1,arg2); @@ -9707,11 +10329,16 @@ static PyObject *_wrap_EncodingConverter_GetAllEquivalents(PyObject *self, PyObj PyObject *resultobj; int arg1 ; wxFontEncodingArray result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "enc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:EncodingConverter_GetAllEquivalents",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EncodingConverter_GetAllEquivalents",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxEncodingConverter::GetAllEquivalents((wxFontEncoding )arg1); @@ -9738,11 +10365,21 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar int arg1 ; int arg2 ; bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "encIn",(char *) "encOut", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii:EncodingConverter_CanConvert",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EncodingConverter_CanConvert",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxEncodingConverter::CanConvert((wxFontEncoding )arg1,(wxFontEncoding )arg2); @@ -9750,7 +10387,7 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9846,17 +10483,34 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * bool result; wxColour temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO|i:DC_FloodFillXY",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFillXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5); @@ -9864,7 +10518,7 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9883,11 +10537,12 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -9897,6 +10552,12 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4); @@ -9904,7 +10565,7 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9918,12 +10579,22 @@ static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *k int arg3 ; wxColour 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 *)"Oii:DC_GetPixelXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_GetPixelXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDC_GetPixelXY(arg1,arg2,arg3); @@ -9986,12 +10657,32 @@ static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *k int arg4 ; int 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 *)"Oiiii:DC_DrawLineXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawLineXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLine(arg2,arg3,arg4,arg5); @@ -10050,12 +10741,22 @@ static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject * int arg2 ; int 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 *)"Oii:DC_CrossHairXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CrossHairXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CrossHair(arg2,arg3); @@ -10111,24 +10812,54 @@ static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kw int arg6 ; int arg7 ; 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 *) "x1",(char *) "y1",(char *) "x2",(char *) "y2",(char *) "xc",(char *) "yc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiiii:DC_DrawArcXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawArc(arg2,arg3,arg4,arg5,arg6,arg7); - - wxPyEndAllowThreads(__tstate); + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->DrawArc(arg2,arg3,arg4,arg5,arg6,arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) { @@ -10184,12 +10915,32 @@ static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObje int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawCheckMarkXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawCheckMarkXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCheckMark(arg2,arg3,arg4,arg5); @@ -10245,12 +10996,42 @@ static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyOb double arg6 ; double arg7 ; 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 *) "x",(char *) "y",(char *) "w",(char *) "h",(char *) "sa",(char *) "ea", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiidd:DC_DrawEllipticArcXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawEllipticArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg7 = (double) SWIG_PyObj_AsDouble(obj6); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc(arg2,arg3,arg4,arg5,arg6,arg7); @@ -10277,11 +11058,13 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "sz",(char *) "sa",(char *) "ea", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -10291,6 +11074,14 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje arg3 = &temp3; if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4,arg5); @@ -10311,12 +11102,22 @@ static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject * int arg2 ; int 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 *)"Oii:DC_DrawPointXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawPointXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPoint(arg2,arg3); @@ -10370,12 +11171,32 @@ static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObje int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawRectangleXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRectangle(arg2,arg3,arg4,arg5); @@ -10468,12 +11289,37 @@ static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, int arg5 ; 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 *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiid:DC_DrawRoundedRectangleXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DC_DrawRoundedRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle(arg2,arg3,arg4,arg5,arg6); @@ -10499,11 +11345,12 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "sz",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOd:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -10513,6 +11360,10 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P arg3 = &temp3; if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4); @@ -10535,16 +11386,21 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "r",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -10566,12 +11422,27 @@ static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject int arg3 ; int arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:DC_DrawCircleXY",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawCircleXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCircle(arg2,arg3,arg4); @@ -10594,16 +11465,21 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k wxPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:DC_DrawCircle",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawCircle",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCircle((wxPoint const &)*arg2,arg3); @@ -10626,12 +11502,32 @@ static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawEllipseXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipseXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipse(arg2,arg3,arg4,arg5); @@ -10723,16 +11619,26 @@ static PyObject *_wrap_DC_DrawIconXY(PyObject *self, PyObject *args, PyObject *k int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "icon",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:DC_DrawIconXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawIconXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawIcon((wxIcon const &)*arg2,arg3,arg4); @@ -10793,20 +11699,30 @@ static PyObject *_wrap_DC_DrawBitmapXY(PyObject *self, PyObject *args, PyObject bool arg5 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bmp",(char *) "x",(char *) "y",(char *) "useMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,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; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if (obj4) { { - arg5 = (bool) SPyObj_AsBool(obj4); + arg5 = (bool) SWIG_PyObj_AsBool(obj4); if (PyErr_Occurred()) SWIG_fail; } } @@ -10851,7 +11767,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -10878,17 +11794,27 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:DC_DrawTextXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawTextXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawText((wxString const &)*arg2,arg3,arg4); @@ -10968,17 +11894,32 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "x",(char *) "y",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiid:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRotatedText((wxString const &)*arg2,arg3,arg4,arg5); @@ -11012,11 +11953,12 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "pt",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOd:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11027,6 +11969,10 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRotatedText((wxString const &)*arg2,(wxPoint const &)*arg3,arg4); @@ -11065,18 +12011,69 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg int arg12 = (int) -1 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xdest",(char *) "ydest",(char *) "width",(char *) "height",(char *) "source",(char *) "xsrc",(char *) "ysrc",(char *) "rop",(char *) "useMask",(char *) "xsrcMask",(char *) "ysrcMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiiOii|iOii:DC_BlitXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&arg7,&arg8,&arg9,&obj9,&arg11,&arg12)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO|OOOO:DC_BlitXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj9) { { - arg10 = (bool) SPyObj_AsBool(obj9); + arg10 = (bool) SWIG_PyObj_AsBool(obj9); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj10) { + { + arg11 = (int) SWIG_PyObj_AsInt(obj10); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj11) { + { + arg12 = (int) SWIG_PyObj_AsInt(obj11); if (PyErr_Occurred()) SWIG_fail; } } @@ -11087,7 +12084,7 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11115,13 +12112,14 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "destPt",(char *) "sz",(char *) "source",(char *) "srcPt",(char *) "rop",(char *) "useMask",(char *) "srcPtMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|iOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -11136,9 +12134,15 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) arg5 = &temp5; if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -11155,7 +12159,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11171,16 +12175,30 @@ static PyObject *_wrap_DC_DrawLines(PyObject *self, PyObject *args, PyObject *kw int arg5 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|ii:DC_DrawLines",kwnames,&obj0,&obj1,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DC_DrawLines",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxPoint_LIST_helper(obj1, &arg2); if (arg3 == NULL) SWIG_fail; } + if (obj2) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3,arg4,arg5); @@ -11211,16 +12229,37 @@ static PyObject *_wrap_DC_DrawPolygon(PyObject *self, PyObject *args, PyObject * int arg6 = (int) wxODDEVEN_RULE ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset",(char *) "fillStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iii:DC_DrawPolygon",kwnames,&obj0,&obj1,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DC_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxPoint_LIST_helper(obj1, &arg2); if (arg3 == NULL) SWIG_fail; } + if (obj2) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4,arg5,arg6); @@ -11253,11 +12292,13 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|ii:DC_DrawLabel",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:DC_DrawLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11268,6 +12309,18 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw arg3 = &temp3; if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLabel((wxString const &)*arg2,(wxRect const &)*arg3,arg4,arg5); @@ -11305,11 +12358,13 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "image",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|ii:DC_DrawImageLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:DC_DrawImageLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11324,6 +12379,18 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec arg4 = &temp4; if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDC_DrawImageLabel(arg1,(wxString const &)*arg2,(wxBitmap const &)*arg3,(wxRect const &)*arg4,arg5,arg6); @@ -11437,7 +12504,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -11649,12 +12716,17 @@ static PyObject *_wrap_DC_SetBackgroundMode(PyObject *self, PyObject *args, PyOb wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetBackgroundMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBackgroundMode(arg2); @@ -11707,12 +12779,32 @@ static PyObject *_wrap_DC_SetClippingRegionXY(PyObject *self, PyObject *args, Py int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_SetClippingRegionXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_SetClippingRegionXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetClippingRegion(arg2,arg3,arg4,arg5); @@ -11949,7 +13041,7 @@ static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11974,7 +13066,7 @@ static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12314,12 +13406,17 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->DeviceToLogicalX(arg2); @@ -12327,7 +13424,7 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12340,12 +13437,17 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->DeviceToLogicalY(arg2); @@ -12353,7 +13455,7 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12366,12 +13468,17 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalXRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalXRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->DeviceToLogicalXRel(arg2); @@ -12379,7 +13486,7 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12392,12 +13499,17 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalYRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalYRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->DeviceToLogicalYRel(arg2); @@ -12405,7 +13517,7 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12418,12 +13530,17 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->LogicalToDeviceX(arg2); @@ -12431,7 +13548,7 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12444,12 +13561,17 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->LogicalToDeviceY(arg2); @@ -12457,7 +13579,7 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12470,12 +13592,17 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceXRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceXRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->LogicalToDeviceXRel(arg2); @@ -12483,7 +13610,7 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12496,12 +13623,17 @@ static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, Py int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceYRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceYRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxDC const *)arg1)->LogicalToDeviceYRel(arg2); @@ -12509,7 +13641,7 @@ static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12534,7 +13666,7 @@ static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12559,7 +13691,7 @@ static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12584,7 +13716,7 @@ static PyObject *_wrap_DC_GetDepth(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12638,7 +13770,7 @@ static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12663,7 +13795,7 @@ static PyObject *_wrap_DC_GetBackgroundMode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12918,7 +14050,7 @@ static PyObject *_wrap_DC_GetMapMode(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12930,12 +14062,17 @@ static PyObject *_wrap_DC_SetMapMode(PyObject *self, PyObject *args, PyObject *k wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetMapMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetMapMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMapMode(arg2); @@ -12994,12 +14131,22 @@ static PyObject *_wrap_DC_SetUserScale(PyObject *self, PyObject *args, PyObject 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:DC_SetUserScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetUserScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetUserScale(arg2,arg3); @@ -13058,12 +14205,22 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje 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:DC_SetLogicalScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetLogicalScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalScale(arg2,arg3); @@ -13151,12 +14308,22 @@ static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObj int arg2 ; int 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 *)"Oii:DC_SetLogicalOrigin",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetLogicalOrigin",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalOrigin(arg2,arg3); @@ -13244,12 +14411,22 @@ static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObje int arg2 ; int 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 *)"Oii:DC_SetDeviceOrigin",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetDeviceOrigin",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDeviceOrigin(arg2,arg3); @@ -13279,11 +14456,11 @@ static PyObject *_wrap_DC_SetAxisOrientation(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetAxisOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -13318,7 +14495,7 @@ static PyObject *_wrap_DC_GetLogicalFunction(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13330,12 +14507,17 @@ static PyObject *_wrap_DC_SetLogicalFunction(PyObject *self, PyObject *args, PyO wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "function", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetLogicalFunction",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetLogicalFunction",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalFunction(arg2); @@ -13363,7 +14545,7 @@ static PyObject *_wrap_DC_SetOptimization(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetOptimization",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13398,7 +14580,7 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13411,12 +14593,22 @@ static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObje int arg2 ; int 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 *)"Oii:DC_CalcBoundingBox",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CalcBoundingBox",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CalcBoundingBox(arg2,arg3); @@ -13473,7 +14665,7 @@ static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13498,7 +14690,7 @@ static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13523,7 +14715,7 @@ static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13548,7 +14740,7 @@ static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14083,7 +15275,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14113,7 +15305,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14138,7 +15330,7 @@ static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14265,7 +15457,7 @@ static PyObject *_wrap_new_MirrorDC(PyObject *self, PyObject *args, PyObject *kw PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -14378,11 +15570,16 @@ static PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *self, PyObject *args, static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "ppi", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:PostScriptDC_SetResolution",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_SetResolution",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPostScriptDC::SetResolution(arg1); @@ -14412,7 +15609,7 @@ static PyObject *_wrap_PostScriptDC_GetResolution(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14509,7 +15706,7 @@ static PyObject *_wrap_MetaFile_Ok(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14523,12 +15720,26 @@ static PyObject *_wrap_MetaFile_SetClipboard(PyObject *self, PyObject *args, PyO int arg3 = (int) 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:MetaFile_SetClipboard",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:MetaFile_SetClipboard",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetClipboard(arg2,arg3); @@ -14536,7 +15747,7 @@ static PyObject *_wrap_MetaFile_SetClipboard(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14590,7 +15801,7 @@ static PyObject *_wrap_MetaFile_GetWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14615,7 +15826,7 @@ static PyObject *_wrap_MetaFile_GetHeight(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14675,12 +15886,14 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject * bool temp1 = False ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "width",(char *) "height",(char *) "description", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiiO:new_MetaFileDC",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_MetaFileDC",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -14688,6 +15901,18 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject * temp1 = True; } } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -14799,11 +16024,35 @@ static PyObject *_wrap_new_ImageList(PyObject *self, PyObject *args, PyObject *k int arg3 = (int) True ; int arg4 = (int) 1 ; wxImageList *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "mask",(char *) "initialCount", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|ii:new_ImageList",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_ImageList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImageList *)new wxImageList(arg1,arg2,arg3,arg4); @@ -14877,7 +16126,7 @@ static PyObject *_wrap_ImageList_Add(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14915,7 +16164,7 @@ static PyObject *_wrap_ImageList_AddWithColourMask(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14946,7 +16195,7 @@ static PyObject *_wrap_ImageList_AddIcon(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14962,14 +16211,19 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "bitmap",(char *) "mask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:ImageList_Replace",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ImageList_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -14987,7 +16241,7 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15005,21 +16259,43 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject * bool arg7 = (bool) (bool)False ; 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 *) "index",(char *) "dc",(char *) "x",(char *) "x",(char *) "flags",(char *) "solidBackground", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOii|iO:ImageList_Draw",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:ImageList_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg7 = (bool const) SPyObj_AsBool(obj6); + arg7 = (bool const) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -15030,7 +16306,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15055,7 +16331,7 @@ static PyObject *_wrap_ImageList_GetImageCount(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15068,12 +16344,17 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ImageList_Remove",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_Remove",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Remove(arg2); @@ -15081,7 +16362,7 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15106,7 +16387,7 @@ static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15122,14 +16403,19 @@ static PyObject *_wrap_ImageList_GetSize(PyObject *self, PyObject *args, PyObjec int temp3 ; int temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; arg3 = &temp3; arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ImageList_GetSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetSize(arg2,*arg3,*arg4); @@ -15159,1203 +16445,1260 @@ static PyObject * ImageList_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pen", NULL - }; +static int _wrap_NORMAL_FONT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NORMAL_FONT is read-only."); + return 1; +} + + +static PyObject *_wrap_NORMAL_FONT_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddPen(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxNORMAL_FONT, SWIGTYPE_p_wxFont, 0); + return pyobj; } -static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxColour *arg2 = 0 ; - int arg3 ; - int arg4 ; - wxPen *result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour",(char *) "width",(char *) "style", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); - return resultobj; - fail: - return NULL; +static int _wrap_SMALL_FONT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable SMALL_FONT is read-only."); + return 1; } -static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pen", NULL - }; +static PyObject *_wrap_SMALL_FONT_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemovePen(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxSMALL_FONT, SWIGTYPE_p_wxFont, 0); + return pyobj; } -static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PenList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; +static int _wrap_ITALIC_FONT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ITALIC_FONT is read-only."); + return 1; } -static PyObject * PenList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxPenList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxBrush *arg2 = (wxBrush *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "brush", NULL - }; +static PyObject *_wrap_ITALIC_FONT_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddBrush(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxITALIC_FONT, SWIGTYPE_p_wxFont, 0); + return pyobj; } -static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxColour *arg2 = 0 ; - int arg3 ; - wxBrush *result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour",(char *) "style", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0); - return resultobj; - fail: - return NULL; +static int _wrap_SWISS_FONT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable SWISS_FONT is read-only."); + return 1; } -static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxBrush *arg2 = (wxBrush *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "brush", NULL - }; +static PyObject *_wrap_SWISS_FONT_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemoveBrush(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxSWISS_FONT, SWIGTYPE_p_wxFont, 0); + return pyobj; } -static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static int _wrap_RED_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable RED_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_RED_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BrushList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxRED_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxBrushList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +static int _wrap_CYAN_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable CYAN_PEN is read-only."); + return 1; } -static PyObject *_wrap_new_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *result; - char *kwnames[] = { - NULL - }; + + +static PyObject *_wrap_CYAN_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ColourDatabase",kwnames)) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxColourDatabase *)new wxColourDatabase(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColourDatabase, 1); - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxCYAN_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ColourDatabase",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +static int _wrap_GREEN_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREEN_PEN is read-only."); + return 1; } -static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - wxColour result; - bool temp2 = False ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name", NULL - }; +static PyObject *_wrap_GREEN_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = True; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxColour * resultptr; - resultptr = new wxColour((wxColour &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); - } - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxGREEN_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxColour *arg2 = 0 ; - wxString result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; - fail: - return NULL; +static int _wrap_BLACK_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLACK_PEN is read-only."); + return 1; } -static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - wxColour *arg3 = 0 ; - bool temp2 = False ; - wxColour temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "colour", NULL - }; +static PyObject *_wrap_BLACK_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = True; - } - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxBLACK_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - int arg3 ; - int arg4 ; - int arg5 ; - bool temp2 = False ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL - }; +static int _wrap_WHITE_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable WHITE_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_WHITE_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiii:ColourDatabase_Append",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = True; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxWHITE_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject * ColourDatabase_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxColourDatabase, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +static int _wrap_TRANSPARENT_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_PEN is read-only."); + return 1; } -static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "font", NULL - }; + + +static PyObject *_wrap_TRANSPARENT_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddFont(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - int arg2 ; - int arg3 ; - int arg4 ; - int arg5 ; - bool arg6 = (bool) False ; - wxString const &arg7_defvalue = wxPyEmptyString ; - wxString *arg7 = (wxString *) &arg7_defvalue ; - int arg8 = (int) wxFONTENCODING_DEFAULT ; - wxFont *result; - bool temp7 = False ; - PyObject * obj0 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL - }; +static int _wrap_BLACK_DASHED_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLACK_DASHED_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_BLACK_DASHED_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|OOi:FontList_FindOrCreateFont",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&arg8)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj5) { - { - arg6 = (bool) SPyObj_AsBool(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - } - if (obj6) { - { - arg7 = wxString_in_helper(obj6); - if (arg7 == NULL) SWIG_fail; - temp7 = True; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,(wxFontEncoding )arg8); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); - { - if (temp7) - delete arg7; - } - return resultobj; - fail: - { - if (temp7) - delete arg7; - } - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxBLACK_DASHED_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "font", NULL - }; +static int _wrap_GREY_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREY_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_GREY_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemoveFont(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxGREY_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static int _wrap_MEDIUM_GREY_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_PEN is read-only."); + return 1; +} + + +static PyObject *_wrap_MEDIUM_GREY_PEN_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; + pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; } -static PyObject * FontList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxFontList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +static int _wrap_LIGHT_GREY_PEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_PEN is read-only."); + return 1; } -static int _wrap_NORMAL_FONT_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NORMAL_FONT is read-only."); + + +static PyObject *_wrap_LIGHT_GREY_PEN_get() { + PyObject *pyobj; + + pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_PEN, SWIGTYPE_p_wxPen, 0); + return pyobj; +} + + +static int _wrap_BLUE_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLUE_BRUSH is read-only."); return 1; } -static PyObject *_wrap_NORMAL_FONT_get() { +static PyObject *_wrap_BLUE_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxNORMAL_FONT, SWIGTYPE_p_wxFont, 0); + pyobj = SWIG_NewPointerObj((void *) wxBLUE_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_SMALL_FONT_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable SMALL_FONT is read-only."); +static int _wrap_GREEN_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREEN_BRUSH is read-only."); return 1; } -static PyObject *_wrap_SMALL_FONT_get() { +static PyObject *_wrap_GREEN_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxSMALL_FONT, SWIGTYPE_p_wxFont, 0); + pyobj = SWIG_NewPointerObj((void *) wxGREEN_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_ITALIC_FONT_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable ITALIC_FONT is read-only."); +static int _wrap_WHITE_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable WHITE_BRUSH is read-only."); return 1; } -static PyObject *_wrap_ITALIC_FONT_get() { +static PyObject *_wrap_WHITE_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxITALIC_FONT, SWIGTYPE_p_wxFont, 0); + pyobj = SWIG_NewPointerObj((void *) wxWHITE_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_SWISS_FONT_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable SWISS_FONT is read-only."); +static int _wrap_BLACK_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLACK_BRUSH is read-only."); return 1; } -static PyObject *_wrap_SWISS_FONT_get() { +static PyObject *_wrap_BLACK_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxSWISS_FONT, SWIGTYPE_p_wxFont, 0); + pyobj = SWIG_NewPointerObj((void *) wxBLACK_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_RED_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable RED_PEN is read-only."); +static int _wrap_TRANSPARENT_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_BRUSH is read-only."); return 1; } -static PyObject *_wrap_RED_PEN_get() { +static PyObject *_wrap_TRANSPARENT_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxRED_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_CYAN_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable CYAN_PEN is read-only."); +static int _wrap_CYAN_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable CYAN_BRUSH is read-only."); return 1; } -static PyObject *_wrap_CYAN_PEN_get() { +static PyObject *_wrap_CYAN_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxCYAN_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxCYAN_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_GREEN_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREEN_PEN is read-only."); +static int _wrap_RED_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable RED_BRUSH is read-only."); return 1; } -static PyObject *_wrap_GREEN_PEN_get() { +static PyObject *_wrap_RED_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxGREEN_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxRED_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_BLACK_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLACK_PEN is read-only."); +static int _wrap_GREY_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREY_BRUSH is read-only."); return 1; } -static PyObject *_wrap_BLACK_PEN_get() { +static PyObject *_wrap_GREY_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLACK_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxGREY_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_WHITE_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable WHITE_PEN is read-only."); +static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_BRUSH is read-only."); return 1; } -static PyObject *_wrap_WHITE_PEN_get() { +static PyObject *_wrap_MEDIUM_GREY_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxWHITE_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_TRANSPARENT_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_PEN is read-only."); +static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_BRUSH is read-only."); return 1; } -static PyObject *_wrap_TRANSPARENT_PEN_get() { +static PyObject *_wrap_LIGHT_GREY_BRUSH_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_BLACK_DASHED_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLACK_DASHED_PEN is read-only."); +static int _wrap_BLACK_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLACK is read-only."); return 1; } -static PyObject *_wrap_BLACK_DASHED_PEN_get() { +static PyObject *_wrap_BLACK_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLACK_DASHED_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxBLACK, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_GREY_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREY_PEN is read-only."); +static int _wrap_WHITE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable WHITE is read-only."); return 1; } -static PyObject *_wrap_GREY_PEN_get() { +static PyObject *_wrap_WHITE_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxGREY_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxWHITE, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_MEDIUM_GREY_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_PEN is read-only."); +static int _wrap_RED_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable RED is read-only."); return 1; } -static PyObject *_wrap_MEDIUM_GREY_PEN_get() { +static PyObject *_wrap_RED_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxRED, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_LIGHT_GREY_PEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_PEN is read-only."); +static int _wrap_BLUE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable BLUE is read-only."); return 1; } -static PyObject *_wrap_LIGHT_GREY_PEN_get() { +static PyObject *_wrap_BLUE_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_PEN, SWIGTYPE_p_wxPen, 0); + pyobj = SWIG_NewPointerObj((void *) wxBLUE, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_BLUE_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLUE_BRUSH is read-only."); +static int _wrap_GREEN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GREEN is read-only."); return 1; } -static PyObject *_wrap_BLUE_BRUSH_get() { +static PyObject *_wrap_GREEN_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLUE_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxGREEN, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_GREEN_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREEN_BRUSH is read-only."); +static int _wrap_CYAN_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable CYAN is read-only."); return 1; } -static PyObject *_wrap_GREEN_BRUSH_get() { +static PyObject *_wrap_CYAN_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxGREEN_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxCYAN, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_WHITE_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable WHITE_BRUSH is read-only."); +static int _wrap_LIGHT_GREY_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY is read-only."); return 1; } -static PyObject *_wrap_WHITE_BRUSH_get() { +static PyObject *_wrap_LIGHT_GREY_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxWHITE_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_BLACK_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLACK_BRUSH is read-only."); +static int _wrap_STANDARD_CURSOR_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable STANDARD_CURSOR is read-only."); return 1; } -static PyObject *_wrap_BLACK_BRUSH_get() { +static PyObject *_wrap_STANDARD_CURSOR_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLACK_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxSTANDARD_CURSOR, SWIGTYPE_p_wxCursor, 0); return pyobj; } -static int _wrap_TRANSPARENT_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_BRUSH is read-only."); +static int _wrap_HOURGLASS_CURSOR_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable HOURGLASS_CURSOR is read-only."); return 1; } -static PyObject *_wrap_TRANSPARENT_BRUSH_get() { +static PyObject *_wrap_HOURGLASS_CURSOR_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxTRANSPARENT_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxHOURGLASS_CURSOR, SWIGTYPE_p_wxCursor, 0); return pyobj; } -static int _wrap_CYAN_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable CYAN_BRUSH is read-only."); +static int _wrap_CROSS_CURSOR_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable CROSS_CURSOR is read-only."); return 1; } -static PyObject *_wrap_CYAN_BRUSH_get() { +static PyObject *_wrap_CROSS_CURSOR_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxCYAN_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) wxCROSS_CURSOR, SWIGTYPE_p_wxCursor, 0); return pyobj; } -static int _wrap_RED_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable RED_BRUSH is read-only."); +static int _wrap_NullBitmap_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullBitmap is read-only."); return 1; } -static PyObject *_wrap_RED_BRUSH_get() { +static PyObject *_wrap_NullBitmap_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxRED_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullBitmap, SWIGTYPE_p_wxBitmap, 0); return pyobj; } -static int _wrap_GREY_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREY_BRUSH is read-only."); +static int _wrap_NullIcon_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullIcon is read-only."); return 1; } -static PyObject *_wrap_GREY_BRUSH_get() { +static PyObject *_wrap_NullIcon_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxGREY_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullIcon, SWIGTYPE_p_wxIcon, 0); return pyobj; } -static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_BRUSH is read-only."); +static int _wrap_NullCursor_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullCursor is read-only."); return 1; } -static PyObject *_wrap_MEDIUM_GREY_BRUSH_get() { +static PyObject *_wrap_NullCursor_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxMEDIUM_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullCursor, SWIGTYPE_p_wxCursor, 0); return pyobj; } -static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_BRUSH is read-only."); +static int _wrap_NullPen_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullPen is read-only."); return 1; } -static PyObject *_wrap_LIGHT_GREY_BRUSH_get() { +static PyObject *_wrap_NullPen_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY_BRUSH, SWIGTYPE_p_wxBrush, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullPen, SWIGTYPE_p_wxPen, 0); return pyobj; } -static int _wrap_BLACK_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLACK is read-only."); +static int _wrap_NullBrush_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullBrush is read-only."); return 1; } -static PyObject *_wrap_BLACK_get() { +static PyObject *_wrap_NullBrush_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLACK, SWIGTYPE_p_wxColour, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullBrush, SWIGTYPE_p_wxBrush, 0); return pyobj; } -static int _wrap_WHITE_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable WHITE is read-only."); +static int _wrap_NullPalette_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullPalette is read-only."); return 1; } -static PyObject *_wrap_WHITE_get() { +static PyObject *_wrap_NullPalette_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxWHITE, SWIGTYPE_p_wxColour, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullPalette, SWIGTYPE_p_wxPalette, 0); return pyobj; } -static int _wrap_RED_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable RED is read-only."); +static int _wrap_NullFont_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullFont is read-only."); return 1; } -static PyObject *_wrap_RED_get() { +static PyObject *_wrap_NullFont_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxRED, SWIGTYPE_p_wxColour, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullFont, SWIGTYPE_p_wxFont, 0); return pyobj; } -static int _wrap_BLUE_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable BLUE is read-only."); +static int _wrap_NullColour_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable NullColour is read-only."); return 1; } -static PyObject *_wrap_BLUE_get() { +static PyObject *_wrap_NullColour_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) wxBLUE, SWIGTYPE_p_wxColour, 0); + pyobj = SWIG_NewPointerObj((void *) &wxNullColour, SWIGTYPE_p_wxColour, 0); return pyobj; } -static int _wrap_GREEN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable GREEN is read-only."); - return 1; +static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPenList *arg1 = (wxPenList *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pen", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AddPen(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_GREEN_get() { - PyObject *pyobj; +static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPenList *arg1 = (wxPenList *) 0 ; + wxColour *arg2 = 0 ; + int arg3 ; + int arg4 ; + wxPen *result; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour",(char *) "width",(char *) "style", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxGREEN, SWIGTYPE_p_wxColour, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); + return resultobj; + fail: + return NULL; } -static int _wrap_CYAN_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable CYAN is read-only."); - return 1; +static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPenList *arg1 = (wxPenList *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pen", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemovePen(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_CYAN_get() { - PyObject *pyobj; +static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPenList *arg1 = (wxPenList *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxCYAN, SWIGTYPE_p_wxColour, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PenList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + return resultobj; + fail: + return NULL; } -static int _wrap_LIGHT_GREY_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY is read-only."); - return 1; +static PyObject * PenList_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxPenList, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); } - - -static PyObject *_wrap_LIGHT_GREY_get() { - PyObject *pyobj; +static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxBrush *arg2 = (wxBrush *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "brush", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxLIGHT_GREY, SWIGTYPE_p_wxColour, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AddBrush(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static int _wrap_STANDARD_CURSOR_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable STANDARD_CURSOR is read-only."); - return 1; +static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxColour *arg2 = 0 ; + int arg3 ; + wxBrush *result; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour",(char *) "style", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0); + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_STANDARD_CURSOR_get() { - PyObject *pyobj; +static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxBrush *arg2 = (wxBrush *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "brush", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxSTANDARD_CURSOR, SWIGTYPE_p_wxCursor, 0); - return pyobj; -} - - -static int _wrap_HOURGLASS_CURSOR_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable HOURGLASS_CURSOR is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemoveBrush(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_HOURGLASS_CURSOR_get() { - PyObject *pyobj; +static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBrushList *arg1 = (wxBrushList *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxHOURGLASS_CURSOR, SWIGTYPE_p_wxCursor, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BrushList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + return resultobj; + fail: + return NULL; } -static int _wrap_CROSS_CURSOR_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable CROSS_CURSOR is read-only."); - return 1; +static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxBrushList, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); } - - -static PyObject *_wrap_CROSS_CURSOR_get() { - PyObject *pyobj; +static PyObject *_wrap_new_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *result; + char *kwnames[] = { + NULL + }; - pyobj = SWIG_NewPointerObj((void *) wxCROSS_CURSOR, SWIGTYPE_p_wxCursor, 0); - return pyobj; -} - - -static int _wrap_NullBitmap_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullBitmap is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ColourDatabase",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxColourDatabase *)new wxColourDatabase(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColourDatabase, 1); + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_NullBitmap_get() { - PyObject *pyobj; +static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullBitmap, SWIGTYPE_p_wxBitmap, 0); - return pyobj; -} - - -static int _wrap_NullIcon_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullIcon is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ColourDatabase",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_NullIcon_get() { - PyObject *pyobj; +static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + wxColour result; + bool temp2 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "name", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullIcon, SWIGTYPE_p_wxIcon, 0); - return pyobj; -} - - -static int _wrap_NullCursor_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullCursor is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxColour * resultptr; + resultptr = new wxColour((wxColour &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + } + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; } -static PyObject *_wrap_NullCursor_get() { - PyObject *pyobj; +static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxColour *arg2 = 0 ; + wxString result; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullCursor, SWIGTYPE_p_wxCursor, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; } -static int _wrap_NullPen_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullPen is read-only."); - return 1; +static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + wxColour *arg3 = 0 ; + bool temp2 = False ; + wxColour temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "name",(char *) "colour", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; } -static PyObject *_wrap_NullPen_get() { - PyObject *pyobj; +static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + int arg3 ; + int arg4 ; + int arg5 ; + bool temp2 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullPen, SWIGTYPE_p_wxPen, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:ColourDatabase_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; } -static int _wrap_NullBrush_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullBrush is read-only."); - return 1; +static PyObject * ColourDatabase_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxColourDatabase, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); } - - -static PyObject *_wrap_NullBrush_get() { - PyObject *pyobj; +static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "font", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullBrush, SWIGTYPE_p_wxBrush, 0); - return pyobj; -} - - -static int _wrap_NullPalette_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullPalette is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AddFont(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_NullPalette_get() { - PyObject *pyobj; +static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; + bool arg6 = (bool) False ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + int arg8 = (int) wxFONTENCODING_DEFAULT ; + wxFont *result; + bool temp7 = 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 *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullPalette, SWIGTYPE_p_wxPalette, 0); - return pyobj; -} - - -static int _wrap_NullFont_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullFont is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:FontList_FindOrCreateFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (bool) SWIG_PyObj_AsBool(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = True; + } + } + if (obj7) { + { + arg8 = (wxFontEncoding) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,(wxFontEncoding )arg8); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; } -static PyObject *_wrap_NullFont_get() { - PyObject *pyobj; +static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "font", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullFont, SWIGTYPE_p_wxFont, 0); - return pyobj; -} - - -static int _wrap_NullColour_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullColour is read-only."); - return 1; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemoveFont(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; } -static PyObject *_wrap_NullColour_get() { - PyObject *pyobj; +static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - pyobj = SWIG_NewPointerObj((void *) &wxNullColour, SWIGTYPE_p_wxColour, 0); - return pyobj; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + return resultobj; + fail: + return NULL; } -static int _wrap_TheFontList_set(PyObject *_val) { +static PyObject * FontList_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxFontList, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static int _wrap_TheFontList_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheFontList is read-only."); return 1; } @@ -16369,7 +17712,7 @@ static PyObject *_wrap_TheFontList_get() { } -static int _wrap_ThePenList_set(PyObject *_val) { +static int _wrap_ThePenList_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ThePenList is read-only."); return 1; } @@ -16383,7 +17726,7 @@ static PyObject *_wrap_ThePenList_get() { } -static int _wrap_TheBrushList_set(PyObject *_val) { +static int _wrap_TheBrushList_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheBrushList is read-only."); return 1; } @@ -16397,7 +17740,7 @@ static PyObject *_wrap_TheBrushList_get() { } -static int _wrap_TheColourDatabase_set(PyObject *_val) { +static int _wrap_TheColourDatabase_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheColourDatabase is read-only."); return 1; } @@ -16802,11 +18145,12 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "rect",(char *) "borderSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -16816,6 +18160,12 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py arg3 = &temp3; if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSunkenEdge(*arg2,(wxRect const &)*arg3,arg4); @@ -16867,7 +18217,7 @@ static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17831,6 +19181,7 @@ static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxBuf static swig_type_info _swigt__p_wxMirrorDC[] = {{"_p_wxMirrorDC", 0, "wxMirrorDC *", 0},{"_p_wxMirrorDC"},{0}}; static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "byte *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; static swig_type_info _swigt__p_wxPyFontEnumerator[] = {{"_p_wxPyFontEnumerator", 0, "wxPyFontEnumerator *", 0},{"_p_wxPyFontEnumerator"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxIconLocation[] = {{"_p_wxIconLocation", 0, "wxIconLocation *", 0},{"_p_wxIconLocation"},{0}}; static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0},{"_p_wxImage"},{0}}; static swig_type_info _swigt__p_wxMetaFileDC[] = {{"_p_wxMetaFileDC", 0, "wxMetaFileDC *", 0},{"_p_wxMetaFileDC"},{0}}; @@ -17860,8 +19211,8 @@ static swig_type_info _swigt__p_wxBufferedDC[] = {{"_p_wxBufferedDC", 0, "wxBuff static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}}; static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; static swig_type_info _swigt__p_wxGDIObject[] = {{"_p_wxGDIObject", 0, "wxGDIObject *", 0},{"_p_wxIcon", _p_wxIconTo_p_wxGDIObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxGDIObject},{"_p_wxPen", _p_wxPenTo_p_wxGDIObject},{"_p_wxFont", _p_wxFontTo_p_wxGDIObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxGDIObject},{"_p_wxGDIObject"},{"_p_wxCursor", _p_wxCursorTo_p_wxGDIObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxGDIObject},{"_p_wxRegion", _p_wxRegionTo_p_wxGDIObject},{"_p_wxBrush", _p_wxBrushTo_p_wxGDIObject},{0}}; -static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0},{"_p_wxLocale"},{0}}; static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0},{"_p_wxIcon"},{0}}; +static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0},{"_p_wxLocale"},{0}}; static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0},{"_p_wxRegion"},{0}}; static swig_type_info _swigt__p_wxLanguageInfo[] = {{"_p_wxLanguageInfo", 0, "wxLanguageInfo *", 0},{"_p_wxLanguageInfo"},{0}}; static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0},{"_p_wxConfigBase"},{0}}; @@ -17888,6 +19239,7 @@ _swigt__p_wxDC, _swigt__p_wxMirrorDC, _swigt__p_byte, _swigt__p_wxPyFontEnumerator, +_swigt__p_char, _swigt__p_wxIconLocation, _swigt__p_wxImage, _swigt__p_wxMetaFileDC, @@ -17917,8 +19269,8 @@ _swigt__p_wxBufferedDC, _swigt__p_wxImageList, _swigt__p_unsigned_char, _swigt__p_wxGDIObject, -_swigt__p_wxLocale, _swigt__p_wxIcon, +_swigt__p_wxLocale, _swigt__p_wxRegion, _swigt__p_wxLanguageInfo, _swigt__p_wxConfigBase, @@ -17943,385 +19295,6 @@ _swigt__p_wxColourDatabase, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"OutRegion", (long) wxOutRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PartRegion", (long) wxPartRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"InRegion", (long) wxInRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_DEFAULT", (long) wxFONTFAMILY_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_DECORATIVE", (long) wxFONTFAMILY_DECORATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_ROMAN", (long) wxFONTFAMILY_ROMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_SCRIPT", (long) wxFONTFAMILY_SCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_SWISS", (long) wxFONTFAMILY_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_MODERN", (long) wxFONTFAMILY_MODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_TELETYPE", (long) wxFONTFAMILY_TELETYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_MAX", (long) wxFONTFAMILY_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_UNKNOWN", (long) wxFONTFAMILY_UNKNOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_NORMAL", (long) wxFONTSTYLE_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_ITALIC", (long) wxFONTSTYLE_ITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_SLANT", (long) wxFONTSTYLE_SLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_MAX", (long) wxFONTSTYLE_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_NORMAL", (long) wxFONTWEIGHT_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_LIGHT", (long) wxFONTWEIGHT_LIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_BOLD", (long) wxFONTWEIGHT_BOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_MAX", (long) wxFONTWEIGHT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_DEFAULT", (long) wxFONTFLAG_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_ITALIC", (long) wxFONTFLAG_ITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_SLANT", (long) wxFONTFLAG_SLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_LIGHT", (long) wxFONTFLAG_LIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_BOLD", (long) wxFONTFLAG_BOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_ANTIALIASED", (long) wxFONTFLAG_ANTIALIASED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_NOT_ANTIALIASED", (long) wxFONTFLAG_NOT_ANTIALIASED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_UNDERLINED", (long) wxFONTFLAG_UNDERLINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_STRIKETHROUGH", (long) wxFONTFLAG_STRIKETHROUGH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_MASK", (long) wxFONTFLAG_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_SYSTEM", (long) wxFONTENCODING_SYSTEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_DEFAULT", (long) wxFONTENCODING_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_1", (long) wxFONTENCODING_ISO8859_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_2", (long) wxFONTENCODING_ISO8859_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_3", (long) wxFONTENCODING_ISO8859_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_4", (long) wxFONTENCODING_ISO8859_4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_5", (long) wxFONTENCODING_ISO8859_5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_6", (long) wxFONTENCODING_ISO8859_6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_7", (long) wxFONTENCODING_ISO8859_7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_8", (long) wxFONTENCODING_ISO8859_8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_9", (long) wxFONTENCODING_ISO8859_9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_10", (long) wxFONTENCODING_ISO8859_10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_11", (long) wxFONTENCODING_ISO8859_11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_12", (long) wxFONTENCODING_ISO8859_12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_13", (long) wxFONTENCODING_ISO8859_13, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_14", (long) wxFONTENCODING_ISO8859_14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_15", (long) wxFONTENCODING_ISO8859_15, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_MAX", (long) wxFONTENCODING_ISO8859_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_KOI8", (long) wxFONTENCODING_KOI8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ALTERNATIVE", (long) wxFONTENCODING_ALTERNATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_BULGARIAN", (long) wxFONTENCODING_BULGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP437", (long) wxFONTENCODING_CP437, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP850", (long) wxFONTENCODING_CP850, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP852", (long) wxFONTENCODING_CP852, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP855", (long) wxFONTENCODING_CP855, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP866", (long) wxFONTENCODING_CP866, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP874", (long) wxFONTENCODING_CP874, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP932", (long) wxFONTENCODING_CP932, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP936", (long) wxFONTENCODING_CP936, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP949", (long) wxFONTENCODING_CP949, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP950", (long) wxFONTENCODING_CP950, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1250", (long) wxFONTENCODING_CP1250, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1251", (long) wxFONTENCODING_CP1251, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1252", (long) wxFONTENCODING_CP1252, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1253", (long) wxFONTENCODING_CP1253, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1254", (long) wxFONTENCODING_CP1254, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1255", (long) wxFONTENCODING_CP1255, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1256", (long) wxFONTENCODING_CP1256, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1257", (long) wxFONTENCODING_CP1257, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP12_MAX", (long) wxFONTENCODING_CP12_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF7", (long) wxFONTENCODING_UTF7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF8", (long) wxFONTENCODING_UTF8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_EUC_JP", (long) wxFONTENCODING_EUC_JP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16BE", (long) wxFONTENCODING_UTF16BE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16LE", (long) wxFONTENCODING_UTF16LE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32BE", (long) wxFONTENCODING_UTF32BE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32LE", (long) wxFONTENCODING_UTF32LE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACROMAN", (long) wxFONTENCODING_MACROMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACJAPANESE", (long) wxFONTENCODING_MACJAPANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCHINESETRAD", (long) wxFONTENCODING_MACCHINESETRAD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACKOREAN", (long) wxFONTENCODING_MACKOREAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACARABIC", (long) wxFONTENCODING_MACARABIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACHEBREW", (long) wxFONTENCODING_MACHEBREW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGREEK", (long) wxFONTENCODING_MACGREEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCYRILLIC", (long) wxFONTENCODING_MACCYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACDEVANAGARI", (long) wxFONTENCODING_MACDEVANAGARI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGURMUKHI", (long) wxFONTENCODING_MACGURMUKHI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGUJARATI", (long) wxFONTENCODING_MACGUJARATI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACORIYA", (long) wxFONTENCODING_MACORIYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACBENGALI", (long) wxFONTENCODING_MACBENGALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTAMIL", (long) wxFONTENCODING_MACTAMIL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTELUGU", (long) wxFONTENCODING_MACTELUGU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACKANNADA", (long) wxFONTENCODING_MACKANNADA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACMALAJALAM", (long) wxFONTENCODING_MACMALAJALAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACSINHALESE", (long) wxFONTENCODING_MACSINHALESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACBURMESE", (long) wxFONTENCODING_MACBURMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACKHMER", (long) wxFONTENCODING_MACKHMER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTHAI", (long) wxFONTENCODING_MACTHAI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACLAOTIAN", (long) wxFONTENCODING_MACLAOTIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGEORGIAN", (long) wxFONTENCODING_MACGEORGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACARMENIAN", (long) wxFONTENCODING_MACARMENIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCHINESESIMP", (long) wxFONTENCODING_MACCHINESESIMP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTIBETAN", (long) wxFONTENCODING_MACTIBETAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACMONGOLIAN", (long) wxFONTENCODING_MACMONGOLIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACETHIOPIC", (long) wxFONTENCODING_MACETHIOPIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCENTRALEUR", (long) wxFONTENCODING_MACCENTRALEUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACVIATNAMESE", (long) wxFONTENCODING_MACVIATNAMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACARABICEXT", (long) wxFONTENCODING_MACARABICEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACSYMBOL", (long) wxFONTENCODING_MACSYMBOL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACDINGBATS", (long) wxFONTENCODING_MACDINGBATS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACTURKISH", (long) wxFONTENCODING_MACTURKISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCROATIAN", (long) wxFONTENCODING_MACCROATIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACICELANDIC", (long) wxFONTENCODING_MACICELANDIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACROMANIAN", (long) wxFONTENCODING_MACROMANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACCELTIC", (long) wxFONTENCODING_MACCELTIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACGAELIC", (long) wxFONTENCODING_MACGAELIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACKEYBOARD", (long) wxFONTENCODING_MACKEYBOARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACMIN", (long) wxFONTENCODING_MACMIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MACMAX", (long) wxFONTENCODING_MACMAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MAX", (long) wxFONTENCODING_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16", (long) wxFONTENCODING_UTF16, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32", (long) wxFONTENCODING_UTF32, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UNICODE", (long) wxFONTENCODING_UNICODE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_GB2312", (long) wxFONTENCODING_GB2312, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_BIG5", (long) wxFONTENCODING_BIG5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_SHIFT_JIS", (long) wxFONTENCODING_SHIFT_JIS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DEFAULT", (long) wxLANGUAGE_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UNKNOWN", (long) wxLANGUAGE_UNKNOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ABKHAZIAN", (long) wxLANGUAGE_ABKHAZIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AFAR", (long) wxLANGUAGE_AFAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AFRIKAANS", (long) wxLANGUAGE_AFRIKAANS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ALBANIAN", (long) wxLANGUAGE_ALBANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AMHARIC", (long) wxLANGUAGE_AMHARIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC", (long) wxLANGUAGE_ARABIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_ALGERIA", (long) wxLANGUAGE_ARABIC_ALGERIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_BAHRAIN", (long) wxLANGUAGE_ARABIC_BAHRAIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_EGYPT", (long) wxLANGUAGE_ARABIC_EGYPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_IRAQ", (long) wxLANGUAGE_ARABIC_IRAQ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_JORDAN", (long) wxLANGUAGE_ARABIC_JORDAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_KUWAIT", (long) wxLANGUAGE_ARABIC_KUWAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_LEBANON", (long) wxLANGUAGE_ARABIC_LEBANON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_LIBYA", (long) wxLANGUAGE_ARABIC_LIBYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_MOROCCO", (long) wxLANGUAGE_ARABIC_MOROCCO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_OMAN", (long) wxLANGUAGE_ARABIC_OMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_QATAR", (long) wxLANGUAGE_ARABIC_QATAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SAUDI_ARABIA", (long) wxLANGUAGE_ARABIC_SAUDI_ARABIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SUDAN", (long) wxLANGUAGE_ARABIC_SUDAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SYRIA", (long) wxLANGUAGE_ARABIC_SYRIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_TUNISIA", (long) wxLANGUAGE_ARABIC_TUNISIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_UAE", (long) wxLANGUAGE_ARABIC_UAE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_YEMEN", (long) wxLANGUAGE_ARABIC_YEMEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARMENIAN", (long) wxLANGUAGE_ARMENIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ASSAMESE", (long) wxLANGUAGE_ASSAMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AYMARA", (long) wxLANGUAGE_AYMARA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI", (long) wxLANGUAGE_AZERI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI_CYRILLIC", (long) wxLANGUAGE_AZERI_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI_LATIN", (long) wxLANGUAGE_AZERI_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BASHKIR", (long) wxLANGUAGE_BASHKIR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BASQUE", (long) wxLANGUAGE_BASQUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BELARUSIAN", (long) wxLANGUAGE_BELARUSIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BENGALI", (long) wxLANGUAGE_BENGALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BHUTANI", (long) wxLANGUAGE_BHUTANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BIHARI", (long) wxLANGUAGE_BIHARI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BISLAMA", (long) wxLANGUAGE_BISLAMA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BRETON", (long) wxLANGUAGE_BRETON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BULGARIAN", (long) wxLANGUAGE_BULGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BURMESE", (long) wxLANGUAGE_BURMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CAMBODIAN", (long) wxLANGUAGE_CAMBODIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CATALAN", (long) wxLANGUAGE_CATALAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE", (long) wxLANGUAGE_CHINESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_SIMPLIFIED", (long) wxLANGUAGE_CHINESE_SIMPLIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_TRADITIONAL", (long) wxLANGUAGE_CHINESE_TRADITIONAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_HONGKONG", (long) wxLANGUAGE_CHINESE_HONGKONG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_MACAU", (long) wxLANGUAGE_CHINESE_MACAU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_SINGAPORE", (long) wxLANGUAGE_CHINESE_SINGAPORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_TAIWAN", (long) wxLANGUAGE_CHINESE_TAIWAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CORSICAN", (long) wxLANGUAGE_CORSICAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CROATIAN", (long) wxLANGUAGE_CROATIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CZECH", (long) wxLANGUAGE_CZECH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DANISH", (long) wxLANGUAGE_DANISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DUTCH", (long) wxLANGUAGE_DUTCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DUTCH_BELGIAN", (long) wxLANGUAGE_DUTCH_BELGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH", (long) wxLANGUAGE_ENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_UK", (long) wxLANGUAGE_ENGLISH_UK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_US", (long) wxLANGUAGE_ENGLISH_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_AUSTRALIA", (long) wxLANGUAGE_ENGLISH_AUSTRALIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_BELIZE", (long) wxLANGUAGE_ENGLISH_BELIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_BOTSWANA", (long) wxLANGUAGE_ENGLISH_BOTSWANA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_CANADA", (long) wxLANGUAGE_ENGLISH_CANADA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_CARIBBEAN", (long) wxLANGUAGE_ENGLISH_CARIBBEAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_DENMARK", (long) wxLANGUAGE_ENGLISH_DENMARK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_EIRE", (long) wxLANGUAGE_ENGLISH_EIRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_JAMAICA", (long) wxLANGUAGE_ENGLISH_JAMAICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_NEW_ZEALAND", (long) wxLANGUAGE_ENGLISH_NEW_ZEALAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_PHILIPPINES", (long) wxLANGUAGE_ENGLISH_PHILIPPINES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_SOUTH_AFRICA", (long) wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_TRINIDAD", (long) wxLANGUAGE_ENGLISH_TRINIDAD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_ZIMBABWE", (long) wxLANGUAGE_ENGLISH_ZIMBABWE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ESPERANTO", (long) wxLANGUAGE_ESPERANTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ESTONIAN", (long) wxLANGUAGE_ESTONIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FAEROESE", (long) wxLANGUAGE_FAEROESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FARSI", (long) wxLANGUAGE_FARSI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FIJI", (long) wxLANGUAGE_FIJI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FINNISH", (long) wxLANGUAGE_FINNISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH", (long) wxLANGUAGE_FRENCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_BELGIAN", (long) wxLANGUAGE_FRENCH_BELGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_CANADIAN", (long) wxLANGUAGE_FRENCH_CANADIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_LUXEMBOURG", (long) wxLANGUAGE_FRENCH_LUXEMBOURG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_MONACO", (long) wxLANGUAGE_FRENCH_MONACO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_SWISS", (long) wxLANGUAGE_FRENCH_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRISIAN", (long) wxLANGUAGE_FRISIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GALICIAN", (long) wxLANGUAGE_GALICIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GEORGIAN", (long) wxLANGUAGE_GEORGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN", (long) wxLANGUAGE_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_AUSTRIAN", (long) wxLANGUAGE_GERMAN_AUSTRIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_BELGIUM", (long) wxLANGUAGE_GERMAN_BELGIUM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_LIECHTENSTEIN", (long) wxLANGUAGE_GERMAN_LIECHTENSTEIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_LUXEMBOURG", (long) wxLANGUAGE_GERMAN_LUXEMBOURG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_SWISS", (long) wxLANGUAGE_GERMAN_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GREEK", (long) wxLANGUAGE_GREEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GREENLANDIC", (long) wxLANGUAGE_GREENLANDIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GUARANI", (long) wxLANGUAGE_GUARANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GUJARATI", (long) wxLANGUAGE_GUJARATI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HAUSA", (long) wxLANGUAGE_HAUSA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HEBREW", (long) wxLANGUAGE_HEBREW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HINDI", (long) wxLANGUAGE_HINDI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HUNGARIAN", (long) wxLANGUAGE_HUNGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ICELANDIC", (long) wxLANGUAGE_ICELANDIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INDONESIAN", (long) wxLANGUAGE_INDONESIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INTERLINGUA", (long) wxLANGUAGE_INTERLINGUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INTERLINGUE", (long) wxLANGUAGE_INTERLINGUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INUKTITUT", (long) wxLANGUAGE_INUKTITUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INUPIAK", (long) wxLANGUAGE_INUPIAK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_IRISH", (long) wxLANGUAGE_IRISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ITALIAN", (long) wxLANGUAGE_ITALIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ITALIAN_SWISS", (long) wxLANGUAGE_ITALIAN_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_JAPANESE", (long) wxLANGUAGE_JAPANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_JAVANESE", (long) wxLANGUAGE_JAVANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KANNADA", (long) wxLANGUAGE_KANNADA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KASHMIRI", (long) wxLANGUAGE_KASHMIRI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KASHMIRI_INDIA", (long) wxLANGUAGE_KASHMIRI_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KAZAKH", (long) wxLANGUAGE_KAZAKH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KERNEWEK", (long) wxLANGUAGE_KERNEWEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KINYARWANDA", (long) wxLANGUAGE_KINYARWANDA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KIRGHIZ", (long) wxLANGUAGE_KIRGHIZ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KIRUNDI", (long) wxLANGUAGE_KIRUNDI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KONKANI", (long) wxLANGUAGE_KONKANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KOREAN", (long) wxLANGUAGE_KOREAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KURDISH", (long) wxLANGUAGE_KURDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LAOTHIAN", (long) wxLANGUAGE_LAOTHIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LATIN", (long) wxLANGUAGE_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LATVIAN", (long) wxLANGUAGE_LATVIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LINGALA", (long) wxLANGUAGE_LINGALA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LITHUANIAN", (long) wxLANGUAGE_LITHUANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MACEDONIAN", (long) wxLANGUAGE_MACEDONIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAGASY", (long) wxLANGUAGE_MALAGASY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY", (long) wxLANGUAGE_MALAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAYALAM", (long) wxLANGUAGE_MALAYALAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", (long) wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY_MALAYSIA", (long) wxLANGUAGE_MALAY_MALAYSIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALTESE", (long) wxLANGUAGE_MALTESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MANIPURI", (long) wxLANGUAGE_MANIPURI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MAORI", (long) wxLANGUAGE_MAORI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MARATHI", (long) wxLANGUAGE_MARATHI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MOLDAVIAN", (long) wxLANGUAGE_MOLDAVIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MONGOLIAN", (long) wxLANGUAGE_MONGOLIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NAURU", (long) wxLANGUAGE_NAURU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NEPALI", (long) wxLANGUAGE_NEPALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NEPALI_INDIA", (long) wxLANGUAGE_NEPALI_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NORWEGIAN_BOKMAL", (long) wxLANGUAGE_NORWEGIAN_BOKMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NORWEGIAN_NYNORSK", (long) wxLANGUAGE_NORWEGIAN_NYNORSK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_OCCITAN", (long) wxLANGUAGE_OCCITAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ORIYA", (long) wxLANGUAGE_ORIYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_OROMO", (long) wxLANGUAGE_OROMO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PASHTO", (long) wxLANGUAGE_PASHTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_POLISH", (long) wxLANGUAGE_POLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PORTUGUESE", (long) wxLANGUAGE_PORTUGUESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PORTUGUESE_BRAZILIAN", (long) wxLANGUAGE_PORTUGUESE_BRAZILIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PUNJABI", (long) wxLANGUAGE_PUNJABI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_QUECHUA", (long) wxLANGUAGE_QUECHUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RHAETO_ROMANCE", (long) wxLANGUAGE_RHAETO_ROMANCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ROMANIAN", (long) wxLANGUAGE_ROMANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RUSSIAN", (long) wxLANGUAGE_RUSSIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RUSSIAN_UKRAINE", (long) wxLANGUAGE_RUSSIAN_UKRAINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SAMOAN", (long) wxLANGUAGE_SAMOAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SANGHO", (long) wxLANGUAGE_SANGHO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SANSKRIT", (long) wxLANGUAGE_SANSKRIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SCOTS_GAELIC", (long) wxLANGUAGE_SCOTS_GAELIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN", (long) wxLANGUAGE_SERBIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN_CYRILLIC", (long) wxLANGUAGE_SERBIAN_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN_LATIN", (long) wxLANGUAGE_SERBIAN_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBO_CROATIAN", (long) wxLANGUAGE_SERBO_CROATIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SESOTHO", (long) wxLANGUAGE_SESOTHO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SETSWANA", (long) wxLANGUAGE_SETSWANA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SHONA", (long) wxLANGUAGE_SHONA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SINDHI", (long) wxLANGUAGE_SINDHI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SINHALESE", (long) wxLANGUAGE_SINHALESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SISWATI", (long) wxLANGUAGE_SISWATI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SLOVAK", (long) wxLANGUAGE_SLOVAK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SLOVENIAN", (long) wxLANGUAGE_SLOVENIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SOMALI", (long) wxLANGUAGE_SOMALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH", (long) wxLANGUAGE_SPANISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_ARGENTINA", (long) wxLANGUAGE_SPANISH_ARGENTINA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_BOLIVIA", (long) wxLANGUAGE_SPANISH_BOLIVIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_CHILE", (long) wxLANGUAGE_SPANISH_CHILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_COLOMBIA", (long) wxLANGUAGE_SPANISH_COLOMBIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_COSTA_RICA", (long) wxLANGUAGE_SPANISH_COSTA_RICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", (long) wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_ECUADOR", (long) wxLANGUAGE_SPANISH_ECUADOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_EL_SALVADOR", (long) wxLANGUAGE_SPANISH_EL_SALVADOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_GUATEMALA", (long) wxLANGUAGE_SPANISH_GUATEMALA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_HONDURAS", (long) wxLANGUAGE_SPANISH_HONDURAS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_MEXICAN", (long) wxLANGUAGE_SPANISH_MEXICAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_MODERN", (long) wxLANGUAGE_SPANISH_MODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_NICARAGUA", (long) wxLANGUAGE_SPANISH_NICARAGUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PANAMA", (long) wxLANGUAGE_SPANISH_PANAMA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PARAGUAY", (long) wxLANGUAGE_SPANISH_PARAGUAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PERU", (long) wxLANGUAGE_SPANISH_PERU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PUERTO_RICO", (long) wxLANGUAGE_SPANISH_PUERTO_RICO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_URUGUAY", (long) wxLANGUAGE_SPANISH_URUGUAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_US", (long) wxLANGUAGE_SPANISH_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_VENEZUELA", (long) wxLANGUAGE_SPANISH_VENEZUELA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SUNDANESE", (long) wxLANGUAGE_SUNDANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWAHILI", (long) wxLANGUAGE_SWAHILI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWEDISH", (long) wxLANGUAGE_SWEDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWEDISH_FINLAND", (long) wxLANGUAGE_SWEDISH_FINLAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAGALOG", (long) wxLANGUAGE_TAGALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAJIK", (long) wxLANGUAGE_TAJIK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAMIL", (long) wxLANGUAGE_TAMIL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TATAR", (long) wxLANGUAGE_TATAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TELUGU", (long) wxLANGUAGE_TELUGU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_THAI", (long) wxLANGUAGE_THAI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TIBETAN", (long) wxLANGUAGE_TIBETAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TIGRINYA", (long) wxLANGUAGE_TIGRINYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TONGA", (long) wxLANGUAGE_TONGA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TSONGA", (long) wxLANGUAGE_TSONGA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TURKISH", (long) wxLANGUAGE_TURKISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TURKMEN", (long) wxLANGUAGE_TURKMEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TWI", (long) wxLANGUAGE_TWI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UIGHUR", (long) wxLANGUAGE_UIGHUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UKRAINIAN", (long) wxLANGUAGE_UKRAINIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU", (long) wxLANGUAGE_URDU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU_INDIA", (long) wxLANGUAGE_URDU_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU_PAKISTAN", (long) wxLANGUAGE_URDU_PAKISTAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK", (long) wxLANGUAGE_UZBEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK_CYRILLIC", (long) wxLANGUAGE_UZBEK_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK_LATIN", (long) wxLANGUAGE_UZBEK_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_VIETNAMESE", (long) wxLANGUAGE_VIETNAMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_VOLAPUK", (long) wxLANGUAGE_VOLAPUK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_WELSH", (long) wxLANGUAGE_WELSH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_WOLOF", (long) wxLANGUAGE_WOLOF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_XHOSA", (long) wxLANGUAGE_XHOSA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_YIDDISH", (long) wxLANGUAGE_YIDDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_YORUBA", (long) wxLANGUAGE_YORUBA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ZHUANG", (long) wxLANGUAGE_ZHUANG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ZULU", (long) wxLANGUAGE_ZULU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_USER_DEFINED", (long) wxLANGUAGE_USER_DEFINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_NUMBER", (long) wxLOCALE_CAT_NUMBER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_DATE", (long) wxLOCALE_CAT_DATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_MONEY", (long) wxLOCALE_CAT_MONEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_MAX", (long) wxLOCALE_CAT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_THOUSANDS_SEP", (long) wxLOCALE_THOUSANDS_SEP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_DECIMAL_POINT", (long) wxLOCALE_DECIMAL_POINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_LOAD_DEFAULT", (long) wxLOCALE_LOAD_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CONV_ENCODING", (long) wxLOCALE_CONV_ENCODING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONVERT_STRICT", (long) wxCONVERT_STRICT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONVERT_SUBSTITUTE", (long) wxCONVERT_SUBSTITUTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_CURRENT", (long) wxPLATFORM_CURRENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_UNIX", (long) wxPLATFORM_UNIX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_WINDOWS", (long) wxPLATFORM_WINDOWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_OS2", (long) wxPLATFORM_OS2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_MAC", (long) wxPLATFORM_MAC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_NORMAL", (long) wxIMAGELIST_DRAW_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_TRANSPARENT", (long) wxIMAGELIST_DRAW_TRANSPARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_SELECTED", (long) wxIMAGELIST_DRAW_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_FOCUSED", (long) wxIMAGELIST_DRAW_FOCUSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_NORMAL", (long) wxIMAGE_LIST_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_SMALL", (long) wxIMAGE_LIST_SMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_STATE", (long) wxIMAGE_LIST_STATE, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -18348,9 +19321,388 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"OutRegion", SWIG_PyObj_FromInt((int)wxOutRegion)); + PyDict_SetItemString(d,"PartRegion", SWIG_PyObj_FromInt((int)wxPartRegion)); + PyDict_SetItemString(d,"InRegion", SWIG_PyObj_FromInt((int)wxInRegion)); + PyDict_SetItemString(d,"FONTFAMILY_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTFAMILY_DEFAULT)); + PyDict_SetItemString(d,"FONTFAMILY_DECORATIVE", SWIG_PyObj_FromInt((int)wxFONTFAMILY_DECORATIVE)); + PyDict_SetItemString(d,"FONTFAMILY_ROMAN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_ROMAN)); + PyDict_SetItemString(d,"FONTFAMILY_SCRIPT", SWIG_PyObj_FromInt((int)wxFONTFAMILY_SCRIPT)); + PyDict_SetItemString(d,"FONTFAMILY_SWISS", SWIG_PyObj_FromInt((int)wxFONTFAMILY_SWISS)); + PyDict_SetItemString(d,"FONTFAMILY_MODERN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_MODERN)); + PyDict_SetItemString(d,"FONTFAMILY_TELETYPE", SWIG_PyObj_FromInt((int)wxFONTFAMILY_TELETYPE)); + PyDict_SetItemString(d,"FONTFAMILY_MAX", SWIG_PyObj_FromInt((int)wxFONTFAMILY_MAX)); + PyDict_SetItemString(d,"FONTFAMILY_UNKNOWN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_UNKNOWN)); + PyDict_SetItemString(d,"FONTSTYLE_NORMAL", SWIG_PyObj_FromInt((int)wxFONTSTYLE_NORMAL)); + PyDict_SetItemString(d,"FONTSTYLE_ITALIC", SWIG_PyObj_FromInt((int)wxFONTSTYLE_ITALIC)); + PyDict_SetItemString(d,"FONTSTYLE_SLANT", SWIG_PyObj_FromInt((int)wxFONTSTYLE_SLANT)); + PyDict_SetItemString(d,"FONTSTYLE_MAX", SWIG_PyObj_FromInt((int)wxFONTSTYLE_MAX)); + PyDict_SetItemString(d,"FONTWEIGHT_NORMAL", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_NORMAL)); + PyDict_SetItemString(d,"FONTWEIGHT_LIGHT", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_LIGHT)); + PyDict_SetItemString(d,"FONTWEIGHT_BOLD", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_BOLD)); + PyDict_SetItemString(d,"FONTWEIGHT_MAX", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_MAX)); + PyDict_SetItemString(d,"FONTFLAG_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTFLAG_DEFAULT)); + PyDict_SetItemString(d,"FONTFLAG_ITALIC", SWIG_PyObj_FromInt((int)wxFONTFLAG_ITALIC)); + PyDict_SetItemString(d,"FONTFLAG_SLANT", SWIG_PyObj_FromInt((int)wxFONTFLAG_SLANT)); + PyDict_SetItemString(d,"FONTFLAG_LIGHT", SWIG_PyObj_FromInt((int)wxFONTFLAG_LIGHT)); + PyDict_SetItemString(d,"FONTFLAG_BOLD", SWIG_PyObj_FromInt((int)wxFONTFLAG_BOLD)); + PyDict_SetItemString(d,"FONTFLAG_ANTIALIASED", SWIG_PyObj_FromInt((int)wxFONTFLAG_ANTIALIASED)); + PyDict_SetItemString(d,"FONTFLAG_NOT_ANTIALIASED", SWIG_PyObj_FromInt((int)wxFONTFLAG_NOT_ANTIALIASED)); + PyDict_SetItemString(d,"FONTFLAG_UNDERLINED", SWIG_PyObj_FromInt((int)wxFONTFLAG_UNDERLINED)); + PyDict_SetItemString(d,"FONTFLAG_STRIKETHROUGH", SWIG_PyObj_FromInt((int)wxFONTFLAG_STRIKETHROUGH)); + PyDict_SetItemString(d,"FONTFLAG_MASK", SWIG_PyObj_FromInt((int)wxFONTFLAG_MASK)); + PyDict_SetItemString(d,"FONTENCODING_SYSTEM", SWIG_PyObj_FromInt((int)wxFONTENCODING_SYSTEM)); + PyDict_SetItemString(d,"FONTENCODING_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTENCODING_DEFAULT)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_1", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_1)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_2", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_2)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_3", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_3)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_4", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_4)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_5", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_5)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_6", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_6)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_7", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_7)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_8", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_8)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_9", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_9)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_10", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_10)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_11", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_11)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_12", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_12)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_13", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_13)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_14", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_14)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_15", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_15)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_MAX)); + PyDict_SetItemString(d,"FONTENCODING_KOI8", SWIG_PyObj_FromInt((int)wxFONTENCODING_KOI8)); + PyDict_SetItemString(d,"FONTENCODING_ALTERNATIVE", SWIG_PyObj_FromInt((int)wxFONTENCODING_ALTERNATIVE)); + PyDict_SetItemString(d,"FONTENCODING_BULGARIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_BULGARIAN)); + PyDict_SetItemString(d,"FONTENCODING_CP437", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP437)); + PyDict_SetItemString(d,"FONTENCODING_CP850", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP850)); + PyDict_SetItemString(d,"FONTENCODING_CP852", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP852)); + PyDict_SetItemString(d,"FONTENCODING_CP855", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP855)); + PyDict_SetItemString(d,"FONTENCODING_CP866", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP866)); + PyDict_SetItemString(d,"FONTENCODING_CP874", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP874)); + PyDict_SetItemString(d,"FONTENCODING_CP932", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP932)); + PyDict_SetItemString(d,"FONTENCODING_CP936", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP936)); + PyDict_SetItemString(d,"FONTENCODING_CP949", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP949)); + PyDict_SetItemString(d,"FONTENCODING_CP950", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP950)); + PyDict_SetItemString(d,"FONTENCODING_CP1250", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1250)); + PyDict_SetItemString(d,"FONTENCODING_CP1251", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1251)); + PyDict_SetItemString(d,"FONTENCODING_CP1252", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1252)); + PyDict_SetItemString(d,"FONTENCODING_CP1253", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1253)); + PyDict_SetItemString(d,"FONTENCODING_CP1254", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1254)); + PyDict_SetItemString(d,"FONTENCODING_CP1255", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1255)); + PyDict_SetItemString(d,"FONTENCODING_CP1256", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1256)); + PyDict_SetItemString(d,"FONTENCODING_CP1257", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1257)); + PyDict_SetItemString(d,"FONTENCODING_CP12_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP12_MAX)); + PyDict_SetItemString(d,"FONTENCODING_UTF7", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF7)); + PyDict_SetItemString(d,"FONTENCODING_UTF8", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF8)); + PyDict_SetItemString(d,"FONTENCODING_EUC_JP", SWIG_PyObj_FromInt((int)wxFONTENCODING_EUC_JP)); + PyDict_SetItemString(d,"FONTENCODING_UTF16BE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16BE)); + PyDict_SetItemString(d,"FONTENCODING_UTF16LE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16LE)); + PyDict_SetItemString(d,"FONTENCODING_UTF32BE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32BE)); + PyDict_SetItemString(d,"FONTENCODING_UTF32LE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32LE)); + PyDict_SetItemString(d,"FONTENCODING_MACROMAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACROMAN)); + PyDict_SetItemString(d,"FONTENCODING_MACJAPANESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACJAPANESE)); + PyDict_SetItemString(d,"FONTENCODING_MACCHINESETRAD", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCHINESETRAD)); + PyDict_SetItemString(d,"FONTENCODING_MACKOREAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKOREAN)); + PyDict_SetItemString(d,"FONTENCODING_MACARABIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARABIC)); + PyDict_SetItemString(d,"FONTENCODING_MACHEBREW", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACHEBREW)); + PyDict_SetItemString(d,"FONTENCODING_MACGREEK", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGREEK)); + PyDict_SetItemString(d,"FONTENCODING_MACCYRILLIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCYRILLIC)); + PyDict_SetItemString(d,"FONTENCODING_MACDEVANAGARI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACDEVANAGARI)); + PyDict_SetItemString(d,"FONTENCODING_MACGURMUKHI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGURMUKHI)); + PyDict_SetItemString(d,"FONTENCODING_MACGUJARATI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGUJARATI)); + PyDict_SetItemString(d,"FONTENCODING_MACORIYA", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACORIYA)); + PyDict_SetItemString(d,"FONTENCODING_MACBENGALI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACBENGALI)); + PyDict_SetItemString(d,"FONTENCODING_MACTAMIL", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTAMIL)); + PyDict_SetItemString(d,"FONTENCODING_MACTELUGU", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTELUGU)); + PyDict_SetItemString(d,"FONTENCODING_MACKANNADA", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKANNADA)); + PyDict_SetItemString(d,"FONTENCODING_MACMALAJALAM", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMALAJALAM)); + PyDict_SetItemString(d,"FONTENCODING_MACSINHALESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACSINHALESE)); + PyDict_SetItemString(d,"FONTENCODING_MACBURMESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACBURMESE)); + PyDict_SetItemString(d,"FONTENCODING_MACKHMER", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKHMER)); + PyDict_SetItemString(d,"FONTENCODING_MACTHAI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTHAI)); + PyDict_SetItemString(d,"FONTENCODING_MACLAOTIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACLAOTIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACGEORGIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGEORGIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACARMENIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARMENIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACCHINESESIMP", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCHINESESIMP)); + PyDict_SetItemString(d,"FONTENCODING_MACTIBETAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTIBETAN)); + PyDict_SetItemString(d,"FONTENCODING_MACMONGOLIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMONGOLIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACETHIOPIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACETHIOPIC)); + PyDict_SetItemString(d,"FONTENCODING_MACCENTRALEUR", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCENTRALEUR)); + PyDict_SetItemString(d,"FONTENCODING_MACVIATNAMESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACVIATNAMESE)); + PyDict_SetItemString(d,"FONTENCODING_MACARABICEXT", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARABICEXT)); + PyDict_SetItemString(d,"FONTENCODING_MACSYMBOL", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACSYMBOL)); + PyDict_SetItemString(d,"FONTENCODING_MACDINGBATS", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACDINGBATS)); + PyDict_SetItemString(d,"FONTENCODING_MACTURKISH", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTURKISH)); + PyDict_SetItemString(d,"FONTENCODING_MACCROATIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCROATIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACICELANDIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACICELANDIC)); + PyDict_SetItemString(d,"FONTENCODING_MACROMANIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACROMANIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACCELTIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCELTIC)); + PyDict_SetItemString(d,"FONTENCODING_MACGAELIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGAELIC)); + PyDict_SetItemString(d,"FONTENCODING_MACKEYBOARD", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKEYBOARD)); + PyDict_SetItemString(d,"FONTENCODING_MACMIN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMIN)); + PyDict_SetItemString(d,"FONTENCODING_MACMAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMAX)); + PyDict_SetItemString(d,"FONTENCODING_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_MAX)); + PyDict_SetItemString(d,"FONTENCODING_UTF16", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16)); + PyDict_SetItemString(d,"FONTENCODING_UTF32", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32)); + PyDict_SetItemString(d,"FONTENCODING_UNICODE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UNICODE)); + PyDict_SetItemString(d,"FONTENCODING_GB2312", SWIG_PyObj_FromInt((int)wxFONTENCODING_GB2312)); + PyDict_SetItemString(d,"FONTENCODING_BIG5", SWIG_PyObj_FromInt((int)wxFONTENCODING_BIG5)); + PyDict_SetItemString(d,"FONTENCODING_SHIFT_JIS", SWIG_PyObj_FromInt((int)wxFONTENCODING_SHIFT_JIS)); wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator"); + PyDict_SetItemString(d,"LANGUAGE_DEFAULT", SWIG_PyObj_FromInt((int)wxLANGUAGE_DEFAULT)); + PyDict_SetItemString(d,"LANGUAGE_UNKNOWN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UNKNOWN)); + PyDict_SetItemString(d,"LANGUAGE_ABKHAZIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ABKHAZIAN)); + PyDict_SetItemString(d,"LANGUAGE_AFAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_AFAR)); + PyDict_SetItemString(d,"LANGUAGE_AFRIKAANS", SWIG_PyObj_FromInt((int)wxLANGUAGE_AFRIKAANS)); + PyDict_SetItemString(d,"LANGUAGE_ALBANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ALBANIAN)); + PyDict_SetItemString(d,"LANGUAGE_AMHARIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_AMHARIC)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_ALGERIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_ALGERIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_BAHRAIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_BAHRAIN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_EGYPT", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_EGYPT)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_IRAQ", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_IRAQ)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_JORDAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_JORDAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_KUWAIT", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_KUWAIT)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_LEBANON", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_LEBANON)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_LIBYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_LIBYA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_MOROCCO", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_MOROCCO)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_OMAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_OMAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_QATAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_QATAR)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SAUDI_ARABIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SAUDI_ARABIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SUDAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SUDAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SYRIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SYRIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_TUNISIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_TUNISIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_UAE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_UAE)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_YEMEN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_YEMEN)); + PyDict_SetItemString(d,"LANGUAGE_ARMENIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARMENIAN)); + PyDict_SetItemString(d,"LANGUAGE_ASSAMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ASSAMESE)); + PyDict_SetItemString(d,"LANGUAGE_AYMARA", SWIG_PyObj_FromInt((int)wxLANGUAGE_AYMARA)); + PyDict_SetItemString(d,"LANGUAGE_AZERI", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI)); + PyDict_SetItemString(d,"LANGUAGE_AZERI_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_AZERI_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_BASHKIR", SWIG_PyObj_FromInt((int)wxLANGUAGE_BASHKIR)); + PyDict_SetItemString(d,"LANGUAGE_BASQUE", SWIG_PyObj_FromInt((int)wxLANGUAGE_BASQUE)); + PyDict_SetItemString(d,"LANGUAGE_BELARUSIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_BELARUSIAN)); + PyDict_SetItemString(d,"LANGUAGE_BENGALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BENGALI)); + PyDict_SetItemString(d,"LANGUAGE_BHUTANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BHUTANI)); + PyDict_SetItemString(d,"LANGUAGE_BIHARI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BIHARI)); + PyDict_SetItemString(d,"LANGUAGE_BISLAMA", SWIG_PyObj_FromInt((int)wxLANGUAGE_BISLAMA)); + PyDict_SetItemString(d,"LANGUAGE_BRETON", SWIG_PyObj_FromInt((int)wxLANGUAGE_BRETON)); + PyDict_SetItemString(d,"LANGUAGE_BULGARIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_BULGARIAN)); + PyDict_SetItemString(d,"LANGUAGE_BURMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_BURMESE)); + PyDict_SetItemString(d,"LANGUAGE_CAMBODIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CAMBODIAN)); + PyDict_SetItemString(d,"LANGUAGE_CATALAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CATALAN)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_SIMPLIFIED", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_SIMPLIFIED)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_TRADITIONAL", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_TRADITIONAL)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_HONGKONG", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_HONGKONG)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_MACAU", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_MACAU)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_SINGAPORE", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_SINGAPORE)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_TAIWAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_TAIWAN)); + PyDict_SetItemString(d,"LANGUAGE_CORSICAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CORSICAN)); + PyDict_SetItemString(d,"LANGUAGE_CROATIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CROATIAN)); + PyDict_SetItemString(d,"LANGUAGE_CZECH", SWIG_PyObj_FromInt((int)wxLANGUAGE_CZECH)); + PyDict_SetItemString(d,"LANGUAGE_DANISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_DANISH)); + PyDict_SetItemString(d,"LANGUAGE_DUTCH", SWIG_PyObj_FromInt((int)wxLANGUAGE_DUTCH)); + PyDict_SetItemString(d,"LANGUAGE_DUTCH_BELGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_DUTCH_BELGIAN)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_UK", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_UK)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_US", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_US)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_AUSTRALIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_AUSTRALIA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BELIZE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_BELIZE)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BOTSWANA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_BOTSWANA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CANADA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_CANADA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CARIBBEAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_CARIBBEAN)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_DENMARK", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_DENMARK)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_EIRE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_EIRE)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_JAMAICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_JAMAICA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_NEW_ZEALAND", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_NEW_ZEALAND)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_PHILIPPINES", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_PHILIPPINES)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_SOUTH_AFRICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_SOUTH_AFRICA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_TRINIDAD", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_TRINIDAD)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_ZIMBABWE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_ZIMBABWE)); + PyDict_SetItemString(d,"LANGUAGE_ESPERANTO", SWIG_PyObj_FromInt((int)wxLANGUAGE_ESPERANTO)); + PyDict_SetItemString(d,"LANGUAGE_ESTONIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ESTONIAN)); + PyDict_SetItemString(d,"LANGUAGE_FAEROESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_FAEROESE)); + PyDict_SetItemString(d,"LANGUAGE_FARSI", SWIG_PyObj_FromInt((int)wxLANGUAGE_FARSI)); + PyDict_SetItemString(d,"LANGUAGE_FIJI", SWIG_PyObj_FromInt((int)wxLANGUAGE_FIJI)); + PyDict_SetItemString(d,"LANGUAGE_FINNISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_FINNISH)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_BELGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_BELGIAN)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_CANADIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_CANADIAN)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_LUXEMBOURG", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_LUXEMBOURG)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_MONACO", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_MONACO)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_FRISIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRISIAN)); + PyDict_SetItemString(d,"LANGUAGE_GALICIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GALICIAN)); + PyDict_SetItemString(d,"LANGUAGE_GEORGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GEORGIAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_AUSTRIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_AUSTRIAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_BELGIUM", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_BELGIUM)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_LIECHTENSTEIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_LIECHTENSTEIN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_LUXEMBOURG", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_LUXEMBOURG)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_GREEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_GREEK)); + PyDict_SetItemString(d,"LANGUAGE_GREENLANDIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_GREENLANDIC)); + PyDict_SetItemString(d,"LANGUAGE_GUARANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_GUARANI)); + PyDict_SetItemString(d,"LANGUAGE_GUJARATI", SWIG_PyObj_FromInt((int)wxLANGUAGE_GUJARATI)); + PyDict_SetItemString(d,"LANGUAGE_HAUSA", SWIG_PyObj_FromInt((int)wxLANGUAGE_HAUSA)); + PyDict_SetItemString(d,"LANGUAGE_HEBREW", SWIG_PyObj_FromInt((int)wxLANGUAGE_HEBREW)); + PyDict_SetItemString(d,"LANGUAGE_HINDI", SWIG_PyObj_FromInt((int)wxLANGUAGE_HINDI)); + PyDict_SetItemString(d,"LANGUAGE_HUNGARIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_HUNGARIAN)); + PyDict_SetItemString(d,"LANGUAGE_ICELANDIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_ICELANDIC)); + PyDict_SetItemString(d,"LANGUAGE_INDONESIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_INDONESIAN)); + PyDict_SetItemString(d,"LANGUAGE_INTERLINGUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_INTERLINGUA)); + PyDict_SetItemString(d,"LANGUAGE_INTERLINGUE", SWIG_PyObj_FromInt((int)wxLANGUAGE_INTERLINGUE)); + PyDict_SetItemString(d,"LANGUAGE_INUKTITUT", SWIG_PyObj_FromInt((int)wxLANGUAGE_INUKTITUT)); + PyDict_SetItemString(d,"LANGUAGE_INUPIAK", SWIG_PyObj_FromInt((int)wxLANGUAGE_INUPIAK)); + PyDict_SetItemString(d,"LANGUAGE_IRISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_IRISH)); + PyDict_SetItemString(d,"LANGUAGE_ITALIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ITALIAN)); + PyDict_SetItemString(d,"LANGUAGE_ITALIAN_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_ITALIAN_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_JAPANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_JAPANESE)); + PyDict_SetItemString(d,"LANGUAGE_JAVANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_JAVANESE)); + PyDict_SetItemString(d,"LANGUAGE_KANNADA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KANNADA)); + PyDict_SetItemString(d,"LANGUAGE_KASHMIRI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KASHMIRI)); + PyDict_SetItemString(d,"LANGUAGE_KASHMIRI_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KASHMIRI_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_KAZAKH", SWIG_PyObj_FromInt((int)wxLANGUAGE_KAZAKH)); + PyDict_SetItemString(d,"LANGUAGE_KERNEWEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_KERNEWEK)); + PyDict_SetItemString(d,"LANGUAGE_KINYARWANDA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KINYARWANDA)); + PyDict_SetItemString(d,"LANGUAGE_KIRGHIZ", SWIG_PyObj_FromInt((int)wxLANGUAGE_KIRGHIZ)); + PyDict_SetItemString(d,"LANGUAGE_KIRUNDI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KIRUNDI)); + PyDict_SetItemString(d,"LANGUAGE_KONKANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KONKANI)); + PyDict_SetItemString(d,"LANGUAGE_KOREAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_KOREAN)); + PyDict_SetItemString(d,"LANGUAGE_KURDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_KURDISH)); + PyDict_SetItemString(d,"LANGUAGE_LAOTHIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LAOTHIAN)); + PyDict_SetItemString(d,"LANGUAGE_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_LATVIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LATVIAN)); + PyDict_SetItemString(d,"LANGUAGE_LINGALA", SWIG_PyObj_FromInt((int)wxLANGUAGE_LINGALA)); + PyDict_SetItemString(d,"LANGUAGE_LITHUANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LITHUANIAN)); + PyDict_SetItemString(d,"LANGUAGE_MACEDONIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MACEDONIAN)); + PyDict_SetItemString(d,"LANGUAGE_MALAGASY", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAGASY)); + PyDict_SetItemString(d,"LANGUAGE_MALAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY)); + PyDict_SetItemString(d,"LANGUAGE_MALAYALAM", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAYALAM)); + PyDict_SetItemString(d,"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM)); + PyDict_SetItemString(d,"LANGUAGE_MALAY_MALAYSIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY_MALAYSIA)); + PyDict_SetItemString(d,"LANGUAGE_MALTESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALTESE)); + PyDict_SetItemString(d,"LANGUAGE_MANIPURI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MANIPURI)); + PyDict_SetItemString(d,"LANGUAGE_MAORI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MAORI)); + PyDict_SetItemString(d,"LANGUAGE_MARATHI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MARATHI)); + PyDict_SetItemString(d,"LANGUAGE_MOLDAVIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MOLDAVIAN)); + PyDict_SetItemString(d,"LANGUAGE_MONGOLIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MONGOLIAN)); + PyDict_SetItemString(d,"LANGUAGE_NAURU", SWIG_PyObj_FromInt((int)wxLANGUAGE_NAURU)); + PyDict_SetItemString(d,"LANGUAGE_NEPALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_NEPALI)); + PyDict_SetItemString(d,"LANGUAGE_NEPALI_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_NEPALI_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_BOKMAL", SWIG_PyObj_FromInt((int)wxLANGUAGE_NORWEGIAN_BOKMAL)); + PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_NYNORSK", SWIG_PyObj_FromInt((int)wxLANGUAGE_NORWEGIAN_NYNORSK)); + PyDict_SetItemString(d,"LANGUAGE_OCCITAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_OCCITAN)); + PyDict_SetItemString(d,"LANGUAGE_ORIYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ORIYA)); + PyDict_SetItemString(d,"LANGUAGE_OROMO", SWIG_PyObj_FromInt((int)wxLANGUAGE_OROMO)); + PyDict_SetItemString(d,"LANGUAGE_PASHTO", SWIG_PyObj_FromInt((int)wxLANGUAGE_PASHTO)); + PyDict_SetItemString(d,"LANGUAGE_POLISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_POLISH)); + PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_PORTUGUESE)); + PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE_BRAZILIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_PORTUGUESE_BRAZILIAN)); + PyDict_SetItemString(d,"LANGUAGE_PUNJABI", SWIG_PyObj_FromInt((int)wxLANGUAGE_PUNJABI)); + PyDict_SetItemString(d,"LANGUAGE_QUECHUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_QUECHUA)); + PyDict_SetItemString(d,"LANGUAGE_RHAETO_ROMANCE", SWIG_PyObj_FromInt((int)wxLANGUAGE_RHAETO_ROMANCE)); + PyDict_SetItemString(d,"LANGUAGE_ROMANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ROMANIAN)); + PyDict_SetItemString(d,"LANGUAGE_RUSSIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_RUSSIAN)); + PyDict_SetItemString(d,"LANGUAGE_RUSSIAN_UKRAINE", SWIG_PyObj_FromInt((int)wxLANGUAGE_RUSSIAN_UKRAINE)); + PyDict_SetItemString(d,"LANGUAGE_SAMOAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SAMOAN)); + PyDict_SetItemString(d,"LANGUAGE_SANGHO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SANGHO)); + PyDict_SetItemString(d,"LANGUAGE_SANSKRIT", SWIG_PyObj_FromInt((int)wxLANGUAGE_SANSKRIT)); + PyDict_SetItemString(d,"LANGUAGE_SCOTS_GAELIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SCOTS_GAELIC)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_SERBO_CROATIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBO_CROATIAN)); + PyDict_SetItemString(d,"LANGUAGE_SESOTHO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SESOTHO)); + PyDict_SetItemString(d,"LANGUAGE_SETSWANA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SETSWANA)); + PyDict_SetItemString(d,"LANGUAGE_SHONA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SHONA)); + PyDict_SetItemString(d,"LANGUAGE_SINDHI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SINDHI)); + PyDict_SetItemString(d,"LANGUAGE_SINHALESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SINHALESE)); + PyDict_SetItemString(d,"LANGUAGE_SISWATI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SISWATI)); + PyDict_SetItemString(d,"LANGUAGE_SLOVAK", SWIG_PyObj_FromInt((int)wxLANGUAGE_SLOVAK)); + PyDict_SetItemString(d,"LANGUAGE_SLOVENIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SLOVENIAN)); + PyDict_SetItemString(d,"LANGUAGE_SOMALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SOMALI)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_ARGENTINA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_ARGENTINA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_BOLIVIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_BOLIVIA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_CHILE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_CHILE)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_COLOMBIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_COLOMBIA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_COSTA_RICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_COSTA_RICA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_ECUADOR", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_ECUADOR)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_EL_SALVADOR", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_EL_SALVADOR)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_GUATEMALA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_GUATEMALA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_HONDURAS", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_HONDURAS)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_MEXICAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_MEXICAN)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_MODERN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_MODERN)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_NICARAGUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_NICARAGUA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PANAMA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PANAMA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PARAGUAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PARAGUAY)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PERU", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PERU)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PUERTO_RICO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PUERTO_RICO)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_URUGUAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_URUGUAY)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_US", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_US)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_VENEZUELA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_VENEZUELA)); + PyDict_SetItemString(d,"LANGUAGE_SUNDANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SUNDANESE)); + PyDict_SetItemString(d,"LANGUAGE_SWAHILI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWAHILI)); + PyDict_SetItemString(d,"LANGUAGE_SWEDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWEDISH)); + PyDict_SetItemString(d,"LANGUAGE_SWEDISH_FINLAND", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWEDISH_FINLAND)); + PyDict_SetItemString(d,"LANGUAGE_TAGALOG", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAGALOG)); + PyDict_SetItemString(d,"LANGUAGE_TAJIK", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAJIK)); + PyDict_SetItemString(d,"LANGUAGE_TAMIL", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAMIL)); + PyDict_SetItemString(d,"LANGUAGE_TATAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_TATAR)); + PyDict_SetItemString(d,"LANGUAGE_TELUGU", SWIG_PyObj_FromInt((int)wxLANGUAGE_TELUGU)); + PyDict_SetItemString(d,"LANGUAGE_THAI", SWIG_PyObj_FromInt((int)wxLANGUAGE_THAI)); + PyDict_SetItemString(d,"LANGUAGE_TIBETAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_TIBETAN)); + PyDict_SetItemString(d,"LANGUAGE_TIGRINYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TIGRINYA)); + PyDict_SetItemString(d,"LANGUAGE_TONGA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TONGA)); + PyDict_SetItemString(d,"LANGUAGE_TSONGA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TSONGA)); + PyDict_SetItemString(d,"LANGUAGE_TURKISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_TURKISH)); + PyDict_SetItemString(d,"LANGUAGE_TURKMEN", SWIG_PyObj_FromInt((int)wxLANGUAGE_TURKMEN)); + PyDict_SetItemString(d,"LANGUAGE_TWI", SWIG_PyObj_FromInt((int)wxLANGUAGE_TWI)); + PyDict_SetItemString(d,"LANGUAGE_UIGHUR", SWIG_PyObj_FromInt((int)wxLANGUAGE_UIGHUR)); + PyDict_SetItemString(d,"LANGUAGE_UKRAINIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UKRAINIAN)); + PyDict_SetItemString(d,"LANGUAGE_URDU", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU)); + PyDict_SetItemString(d,"LANGUAGE_URDU_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_URDU_PAKISTAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU_PAKISTAN)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_VIETNAMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_VIETNAMESE)); + PyDict_SetItemString(d,"LANGUAGE_VOLAPUK", SWIG_PyObj_FromInt((int)wxLANGUAGE_VOLAPUK)); + PyDict_SetItemString(d,"LANGUAGE_WELSH", SWIG_PyObj_FromInt((int)wxLANGUAGE_WELSH)); + PyDict_SetItemString(d,"LANGUAGE_WOLOF", SWIG_PyObj_FromInt((int)wxLANGUAGE_WOLOF)); + PyDict_SetItemString(d,"LANGUAGE_XHOSA", SWIG_PyObj_FromInt((int)wxLANGUAGE_XHOSA)); + PyDict_SetItemString(d,"LANGUAGE_YIDDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_YIDDISH)); + PyDict_SetItemString(d,"LANGUAGE_YORUBA", SWIG_PyObj_FromInt((int)wxLANGUAGE_YORUBA)); + PyDict_SetItemString(d,"LANGUAGE_ZHUANG", SWIG_PyObj_FromInt((int)wxLANGUAGE_ZHUANG)); + PyDict_SetItemString(d,"LANGUAGE_ZULU", SWIG_PyObj_FromInt((int)wxLANGUAGE_ZULU)); + PyDict_SetItemString(d,"LANGUAGE_USER_DEFINED", SWIG_PyObj_FromInt((int)wxLANGUAGE_USER_DEFINED)); + PyDict_SetItemString(d,"LOCALE_CAT_NUMBER", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_NUMBER)); + PyDict_SetItemString(d,"LOCALE_CAT_DATE", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_DATE)); + PyDict_SetItemString(d,"LOCALE_CAT_MONEY", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_MONEY)); + PyDict_SetItemString(d,"LOCALE_CAT_MAX", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_MAX)); + PyDict_SetItemString(d,"LOCALE_THOUSANDS_SEP", SWIG_PyObj_FromInt((int)wxLOCALE_THOUSANDS_SEP)); + PyDict_SetItemString(d,"LOCALE_DECIMAL_POINT", SWIG_PyObj_FromInt((int)wxLOCALE_DECIMAL_POINT)); + PyDict_SetItemString(d,"LOCALE_LOAD_DEFAULT", SWIG_PyObj_FromInt((int)wxLOCALE_LOAD_DEFAULT)); + PyDict_SetItemString(d,"LOCALE_CONV_ENCODING", SWIG_PyObj_FromInt((int)wxLOCALE_CONV_ENCODING)); + PyDict_SetItemString(d,"CONVERT_STRICT", SWIG_PyObj_FromInt((int)wxCONVERT_STRICT)); + PyDict_SetItemString(d,"CONVERT_SUBSTITUTE", SWIG_PyObj_FromInt((int)wxCONVERT_SUBSTITUTE)); + PyDict_SetItemString(d,"PLATFORM_CURRENT", SWIG_PyObj_FromInt((int)wxPLATFORM_CURRENT)); + PyDict_SetItemString(d,"PLATFORM_UNIX", SWIG_PyObj_FromInt((int)wxPLATFORM_UNIX)); + PyDict_SetItemString(d,"PLATFORM_WINDOWS", SWIG_PyObj_FromInt((int)wxPLATFORM_WINDOWS)); + PyDict_SetItemString(d,"PLATFORM_OS2", SWIG_PyObj_FromInt((int)wxPLATFORM_OS2)); + PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_PyObj_FromInt((int)wxPLATFORM_MAC)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_NORMAL)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_TRANSPARENT", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_TRANSPARENT)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_SELECTED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_SELECTED)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_FOCUSED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_FOCUSED)); + PyDict_SetItemString(d,"IMAGE_LIST_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_NORMAL)); + PyDict_SetItemString(d,"IMAGE_LIST_SMALL", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_SMALL)); + PyDict_SetItemString(d,"IMAGE_LIST_STATE", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_STATE)); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"NORMAL_FONT",_wrap_NORMAL_FONT_get, _wrap_NORMAL_FONT_set); SWIG_addvarlink(SWIG_globals,(char*)"SMALL_FONT",_wrap_SMALL_FONT_get, _wrap_SMALL_FONT_set); diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index a690fc8100..fce03001ec 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -395,44 +244,45 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxDC swig_types[11] #define SWIGTYPE_p_wxGridTableMessage swig_types[12] #define SWIGTYPE_p_wxGrid swig_types[13] -#define SWIGTYPE_p_wxPanel swig_types[14] -#define SWIGTYPE_p_wxNotifyEvent swig_types[15] -#define SWIGTYPE_p_wxGridRangeSelectEvent swig_types[16] -#define SWIGTYPE_p_wxSize swig_types[17] -#define SWIGTYPE_p_wxGridCellCoords swig_types[18] -#define SWIGTYPE_p_wxScrolledWindow swig_types[19] -#define SWIGTYPE_p_wxWindow swig_types[20] -#define SWIGTYPE_p_wxFont swig_types[21] -#define SWIGTYPE_p_wxControl swig_types[22] -#define SWIGTYPE_p_wxEvent swig_types[23] -#define SWIGTYPE_p_wxObject swig_types[24] -#define SWIGTYPE_p_wxGridSizeEvent swig_types[25] -#define SWIGTYPE_p_wxRect swig_types[26] -#define SWIGTYPE_p_long swig_types[27] -#define SWIGTYPE_p_wxString swig_types[28] -#define SWIGTYPE_p_wxEvtHandler swig_types[29] -#define SWIGTYPE_p_wxPoint swig_types[30] -#define SWIGTYPE_p_wxGridEvent swig_types[31] -#define SWIGTYPE_p_wxGridEditorCreatedEvent swig_types[32] -#define SWIGTYPE_p_wxGridTableBase swig_types[33] -#define SWIGTYPE_p_wxGridCellFloatEditor swig_types[34] +#define SWIGTYPE_p_char swig_types[14] +#define SWIGTYPE_p_wxPanel swig_types[15] +#define SWIGTYPE_p_wxNotifyEvent swig_types[16] +#define SWIGTYPE_p_wxGridRangeSelectEvent swig_types[17] +#define SWIGTYPE_p_wxSize swig_types[18] +#define SWIGTYPE_p_wxGridCellCoords swig_types[19] +#define SWIGTYPE_p_wxScrolledWindow swig_types[20] +#define SWIGTYPE_p_wxWindow swig_types[21] +#define SWIGTYPE_p_wxFont swig_types[22] +#define SWIGTYPE_p_wxControl swig_types[23] +#define SWIGTYPE_p_wxEvent swig_types[24] +#define SWIGTYPE_p_wxObject swig_types[25] +#define SWIGTYPE_p_wxGridSizeEvent swig_types[26] +#define SWIGTYPE_p_wxRect swig_types[27] +#define SWIGTYPE_p_long swig_types[28] +#define SWIGTYPE_p_wxString swig_types[29] +#define SWIGTYPE_p_wxEvtHandler swig_types[30] +#define SWIGTYPE_p_wxPoint swig_types[31] +#define SWIGTYPE_p_wxGridEvent swig_types[32] +#define SWIGTYPE_p_wxGridEditorCreatedEvent swig_types[33] +#define SWIGTYPE_p_wxGridTableBase swig_types[34] #define SWIGTYPE_p_wxGridCellNumberEditor swig_types[35] #define SWIGTYPE_p_wxPyGridCellEditor swig_types[36] #define SWIGTYPE_p_wxGridCellEditor swig_types[37] #define SWIGTYPE_p_wxGridCellTextEditor swig_types[38] -#define SWIGTYPE_p_wxGridCellBoolEditor swig_types[39] -#define SWIGTYPE_p_wxPyGridTableBase swig_types[40] -#define SWIGTYPE_p_wxGridStringTable swig_types[41] -#define SWIGTYPE_p_wxArrayString swig_types[42] -#define SWIGTYPE_p_wxCommandEvent swig_types[43] -#define SWIGTYPE_p_wxGridCellAttrProvider swig_types[44] -#define SWIGTYPE_p_wxKeyEvent swig_types[45] -#define SWIGTYPE_p_wxGridCellChoiceEditor swig_types[46] -#define SWIGTYPE_p_wxGridCellEnumEditor swig_types[47] -#define SWIGTYPE_p_wxGridCellAutoWrapStringEditor swig_types[48] -#define SWIGTYPE_p_int swig_types[49] -#define SWIGTYPE_p_wxPyGridCellAttrProvider swig_types[50] -static swig_type_info *swig_types[52]; +#define SWIGTYPE_p_wxGridCellFloatEditor swig_types[39] +#define SWIGTYPE_p_wxGridCellBoolEditor swig_types[40] +#define SWIGTYPE_p_wxPyGridTableBase swig_types[41] +#define SWIGTYPE_p_wxGridStringTable swig_types[42] +#define SWIGTYPE_p_wxArrayString swig_types[43] +#define SWIGTYPE_p_wxCommandEvent swig_types[44] +#define SWIGTYPE_p_wxGridCellAttrProvider swig_types[45] +#define SWIGTYPE_p_wxKeyEvent swig_types[46] +#define SWIGTYPE_p_wxGridCellChoiceEditor swig_types[47] +#define SWIGTYPE_p_wxGridCellEnumEditor swig_types[48] +#define SWIGTYPE_p_wxGridCellAutoWrapStringEditor swig_types[49] +#define SWIGTYPE_p_int swig_types[50] +#define SWIGTYPE_p_wxPyGridCellAttrProvider swig_types[51] +static swig_type_info *swig_types[53]; /* -------- TYPES TABLE (END) -------- */ @@ -444,6 +294,44 @@ static swig_type_info *swig_types[52]; #define SWIG_name "_grid" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/printfw.h" @@ -897,6 +785,21 @@ void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + class wxPyGridCellRenderer : public wxGridCellRenderer { public: @@ -996,6 +899,15 @@ void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + class wxPyGridCellEditor : public wxGridCellEditor { public: @@ -1171,6 +1083,29 @@ void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + + class wxPyGridTableBase : public wxGridTableBase { public: @@ -1376,7 +1311,7 @@ wxGridCellCoords wxGrid_XYToCell(wxGrid *self,int x,int y){ #ifdef __cplusplus extern "C" { #endif -static int _wrap_DateTimeFormatStr_set(PyObject *_val) { +static int _wrap_DateTimeFormatStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DateTimeFormatStr is read-only."); return 1; } @@ -1396,7 +1331,7 @@ static PyObject *_wrap_DateTimeFormatStr_get() { } -static int _wrap_GridNoCellCoords_set(PyObject *_val) { +static int _wrap_GridNoCellCoords_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GridNoCellCoords is read-only."); return 1; } @@ -1410,7 +1345,7 @@ static PyObject *_wrap_GridNoCellCoords_get() { } -static int _wrap_GridNoCellRect_set(PyObject *_val) { +static int _wrap_GridNoCellRect_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GridNoCellRect is read-only."); return 1; } @@ -1555,12 +1490,14 @@ static PyObject *_wrap_GridCellRenderer_Draw(PyObject *self, PyObject *args, PyO PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "grid",(char *) "attr",(char *) "dc",(char *) "rect",(char *) "row",(char *) "col",(char *) "isSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOiiO:GridCellRenderer_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:GridCellRenderer_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -1579,7 +1516,15 @@ static PyObject *_wrap_GridCellRenderer_Draw(PyObject *self, PyObject *args, PyO if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail; } { - arg8 = (bool) SPyObj_AsBool(obj7); + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } { @@ -1609,11 +1554,13 @@ static PyObject *_wrap_GridCellRenderer_GetBestSize(PyObject *self, PyObject *ar PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "grid",(char *) "attr",(char *) "dc",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOii:GridCellRenderer_GetBestSize",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:GridCellRenderer_GetBestSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -1627,6 +1574,14 @@ static PyObject *_wrap_GridCellRenderer_GetBestSize(PyObject *self, PyObject *ar if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetBestSize(*arg2,*arg3,*arg4,arg5,arg6); @@ -1841,11 +1796,25 @@ static PyObject *_wrap_new_GridCellFloatRenderer(PyObject *self, PyObject *args, int arg1 = (int) -1 ; int arg2 = (int) -1 ; wxGridCellFloatRenderer *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "width",(char *) "precision", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridCellFloatRenderer",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellFloatRenderer",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellFloatRenderer *)new wxGridCellFloatRenderer(arg1,arg2); @@ -1878,7 +1847,7 @@ static PyObject *_wrap_GridCellFloatRenderer_GetWidth(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1890,12 +1859,17 @@ static PyObject *_wrap_GridCellFloatRenderer_SetWidth(PyObject *self, PyObject * wxGridCellFloatRenderer *arg1 = (wxGridCellFloatRenderer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellFloatRenderer_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellFloatRenderer_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellFloatRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -1928,7 +1902,7 @@ static PyObject *_wrap_GridCellFloatRenderer_GetPrecision(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1940,12 +1914,17 @@ static PyObject *_wrap_GridCellFloatRenderer_SetPrecision(PyObject *self, PyObje wxGridCellFloatRenderer *arg1 = (wxGridCellFloatRenderer *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "precision", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellFloatRenderer_SetPrecision",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellFloatRenderer_SetPrecision",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellFloatRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrecision(arg2); @@ -2167,7 +2146,7 @@ static PyObject *_wrap_GridCellEditor_IsCreated(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2378,14 +2357,19 @@ static PyObject *_wrap_GridCellEditor_Create(PyObject *self, PyObject *args, PyO wxEvtHandler *arg4 = (wxEvtHandler *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "evtHandler", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO:GridCellEditor_Create",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellEditor_Create",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2408,13 +2392,23 @@ static PyObject *_wrap_GridCellEditor_BeginEdit(PyObject *self, PyObject *args, int arg3 ; wxGrid *arg4 = (wxGrid *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "grid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridCellEditor_BeginEdit",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellEditor_BeginEdit",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2438,13 +2432,23 @@ static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, Py wxGrid *arg4 = (wxGrid *) 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "grid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridCellEditor_EndEdit",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellEditor_EndEdit",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2453,7 +2457,7 @@ static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2557,7 +2561,7 @@ static PyObject *_wrap_GridCellEditor_Show(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:GridCellEditor_Show",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { @@ -2635,7 +2639,7 @@ static PyObject *_wrap_GridCellEditor_IsAcceptedKey(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2855,7 +2859,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyGridCellEditor_base_Show",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { @@ -2933,7 +2937,7 @@ static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3160,11 +3164,25 @@ static PyObject *_wrap_new_GridCellNumberEditor(PyObject *self, PyObject *args, int arg1 = (int) -1 ; int arg2 = (int) -1 ; wxGridCellNumberEditor *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "min",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridCellNumberEditor",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellNumberEditor",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellNumberEditor *)new wxGridCellNumberEditor(arg1,arg2); @@ -3359,7 +3377,7 @@ static PyObject *_wrap_new_GridCellChoiceEditor(PyObject *self, PyObject *args, } if (obj1) { { - arg3 = (bool) SPyObj_AsBool(obj1); + arg3 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -3816,12 +3834,22 @@ static PyObject *_wrap_GridCellAttr_SetAlignment(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hAlign",(char *) "vAlign", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridCellAttr_SetAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttr_SetAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment(arg2,arg3); @@ -3842,12 +3870,22 @@ static PyObject *_wrap_GridCellAttr_SetSize(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "num_rows",(char *) "num_cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridCellAttr_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttr_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -3876,7 +3914,7 @@ static PyObject *_wrap_GridCellAttr_SetOverflow(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -3908,7 +3946,7 @@ static PyObject *_wrap_GridCellAttr_SetReadOnly(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -3985,12 +4023,17 @@ static PyObject *_wrap_GridCellAttr_SetKind(PyObject *self, PyObject *args, PyOb wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellAttr_SetKind",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellAttr_SetKind",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetKind((wxGridCellAttr::wxAttrKind )arg2); @@ -4023,7 +4066,7 @@ static PyObject *_wrap_GridCellAttr_HasTextColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4048,7 +4091,7 @@ static PyObject *_wrap_GridCellAttr_HasBackgroundColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4073,7 +4116,7 @@ static PyObject *_wrap_GridCellAttr_HasFont(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4098,7 +4141,7 @@ static PyObject *_wrap_GridCellAttr_HasAlignment(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4123,7 +4166,7 @@ static PyObject *_wrap_GridCellAttr_HasRenderer(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4148,7 +4191,7 @@ static PyObject *_wrap_GridCellAttr_HasEditor(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4173,7 +4216,7 @@ static PyObject *_wrap_GridCellAttr_HasReadWriteMode(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4198,7 +4241,7 @@ static PyObject *_wrap_GridCellAttr_HasOverflowMode(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4386,7 +4429,7 @@ static PyObject *_wrap_GridCellAttr_GetOverflow(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4402,13 +4445,23 @@ static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *self, PyObject *args, wxGridCellRenderer *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "grid",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:GridCellAttr_GetRenderer",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttr_GetRenderer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellRenderer *)((wxGridCellAttr const *)arg1)->GetRenderer(arg2,arg3,arg4); @@ -4434,13 +4487,23 @@ static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *self, PyObject *args, Py wxGridCellEditor *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "grid",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:GridCellAttr_GetEditor",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttr_GetEditor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellEditor *)((wxGridCellAttr const *)arg1)->GetEditor(arg2,arg3,arg4); @@ -4475,7 +4538,7 @@ static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4575,12 +4638,27 @@ static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *self, PyObject *ar int arg4 ; wxGridCellAttr *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:GridCellAttrProvider_GetAttr",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttrProvider_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellAttr *)((wxGridCellAttrProvider const *)arg1)->GetAttr(arg2,arg3,(wxGridCellAttr::wxAttrKind )arg4); @@ -4605,13 +4683,23 @@ static PyObject *_wrap_GridCellAttrProvider_SetAttr(PyObject *self, PyObject *ar int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:GridCellAttrProvider_SetAttr",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttrProvider_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttr(arg2,arg3,arg4); @@ -4633,13 +4721,18 @@ static PyObject *_wrap_GridCellAttrProvider_SetRowAttr(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridCellAttrProvider_SetRowAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowAttr(arg2,arg3); @@ -4661,13 +4754,18 @@ static PyObject *_wrap_GridCellAttrProvider_SetColAttr(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridCellAttrProvider_SetColAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColAttr(arg2,arg3); @@ -4689,14 +4787,19 @@ static PyObject *_wrap_GridCellAttrProvider_UpdateAttrRows(PyObject *self, PyObj int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridCellAttrProvider_UpdateAttrRows",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_UpdateAttrRows",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4720,14 +4823,19 @@ static PyObject *_wrap_GridCellAttrProvider_UpdateAttrCols(PyObject *self, PyObj int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridCellAttrProvider_UpdateAttrCols",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_UpdateAttrCols",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -4811,12 +4919,27 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *self, PyObj int arg4 ; wxGridCellAttr *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:PyGridCellAttrProvider_base_GetAttr",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_base_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellAttr *)(arg1)->base_GetAttr(arg2,arg3,(wxGridCellAttr::wxAttrKind )arg4); @@ -4841,13 +4964,23 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *self, PyObj int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:PyGridCellAttrProvider_base_SetAttr",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_base_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetAttr(arg2,arg3,arg4); @@ -4869,13 +5002,18 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *self, Py int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyGridCellAttrProvider_base_SetRowAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellAttrProvider_base_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetRowAttr(arg2,arg3); @@ -4897,13 +5035,18 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *self, Py int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyGridCellAttrProvider_base_SetColAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellAttrProvider_base_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridCellAttrProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetColAttr(arg2,arg3); @@ -5078,7 +5221,7 @@ static PyObject *_wrap_GridTableBase_GetNumberRows(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5103,7 +5246,7 @@ static PyObject *_wrap_GridTableBase_GetNumberCols(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5117,12 +5260,22 @@ static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args, int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_IsEmptyCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_IsEmptyCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsEmptyCell(arg2,arg3); @@ -5130,7 +5283,7 @@ static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5144,12 +5297,22 @@ static PyObject *_wrap_GridTableBase_GetValue(PyObject *self, PyObject *args, Py int arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetValue",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetValue(arg2,arg3); @@ -5178,13 +5341,23 @@ static PyObject *_wrap_GridTableBase_SetValue(PyObject *self, PyObject *args, Py wxString *arg4 = 0 ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridTableBase_SetValue",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValue",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -5219,12 +5392,22 @@ static PyObject *_wrap_GridTableBase_GetTypeName(PyObject *self, PyObject *args, int arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetTypeName",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetTypeName",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetTypeName(arg2,arg3); @@ -5254,13 +5437,23 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg bool result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridTableBase_CanGetValueAs",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_CanGetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -5273,7 +5466,7 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -5297,13 +5490,23 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg bool result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridTableBase_CanSetValueAs",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_CanSetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -5316,7 +5519,7 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -5338,12 +5541,22 @@ static PyObject *_wrap_GridTableBase_GetValueAsLong(PyObject *self, PyObject *ar int arg3 ; long result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetValueAsLong",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsLong",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)(arg1)->GetValueAsLong(arg2,arg3); @@ -5351,7 +5564,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsLong(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -5365,12 +5578,22 @@ static PyObject *_wrap_GridTableBase_GetValueAsDouble(PyObject *self, PyObject * int arg3 ; double result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetValueAsDouble",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsDouble",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)(arg1)->GetValueAsDouble(arg2,arg3); @@ -5378,7 +5601,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsDouble(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -5392,12 +5615,22 @@ static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *ar int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridTableBase_GetValueAsBool",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsBool",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetValueAsBool(arg2,arg3); @@ -5405,7 +5638,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5419,12 +5652,27 @@ static PyObject *_wrap_GridTableBase_SetValueAsLong(PyObject *self, PyObject *ar int arg3 ; long arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiil:GridTableBase_SetValueAsLong",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsLong",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValueAsLong(arg2,arg3,arg4); @@ -5446,12 +5694,27 @@ static PyObject *_wrap_GridTableBase_SetValueAsDouble(PyObject *self, PyObject * int arg3 ; double arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiid:GridTableBase_SetValueAsDouble",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsDouble",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValueAsDouble(arg2,arg3,arg4); @@ -5473,15 +5736,25 @@ static PyObject *_wrap_GridTableBase_SetValueAsBool(PyObject *self, PyObject *ar int arg3 ; bool arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:GridTableBase_SetValueAsBool",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsBool",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = (bool) SPyObj_AsBool(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -5539,13 +5812,13 @@ static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5556,7 +5829,7 @@ static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5578,7 +5851,7 @@ static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -5589,7 +5862,7 @@ static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5613,13 +5886,13 @@ static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5630,7 +5903,7 @@ static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5654,13 +5927,13 @@ static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5671,7 +5944,7 @@ static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5693,7 +5966,7 @@ static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -5704,7 +5977,7 @@ static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5728,13 +6001,13 @@ static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5745,7 +6018,7 @@ static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5758,12 +6031,17 @@ static PyObject *_wrap_GridTableBase_GetRowLabelValue(PyObject *self, PyObject * int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableBase_GetRowLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableBase_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetRowLabelValue(arg2); @@ -5790,12 +6068,17 @@ static PyObject *_wrap_GridTableBase_GetColLabelValue(PyObject *self, PyObject * int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableBase_GetColLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableBase_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetColLabelValue(arg2); @@ -5823,13 +6106,18 @@ static PyObject *_wrap_GridTableBase_SetRowLabelValue(PyObject *self, PyObject * wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:GridTableBase_SetRowLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -5864,13 +6152,18 @@ static PyObject *_wrap_GridTableBase_SetColLabelValue(PyObject *self, PyObject * wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:GridTableBase_SetColLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -5916,7 +6209,7 @@ static PyObject *_wrap_GridTableBase_CanHaveAttributes(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5931,12 +6224,27 @@ static PyObject *_wrap_GridTableBase_GetAttr(PyObject *self, PyObject *args, PyO int arg4 ; wxGridCellAttr *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:GridTableBase_GetAttr",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellAttr *)(arg1)->GetAttr(arg2,arg3,(wxGridCellAttr::wxAttrKind )arg4); @@ -5961,13 +6269,23 @@ static PyObject *_wrap_GridTableBase_SetAttr(PyObject *self, PyObject *args, PyO int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:GridTableBase_SetAttr",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAttr(arg2,arg3,arg4); @@ -5989,13 +6307,18 @@ static PyObject *_wrap_GridTableBase_SetRowAttr(PyObject *self, PyObject *args, int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridTableBase_SetRowAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowAttr(arg2,arg3); @@ -6017,13 +6340,18 @@ static PyObject *_wrap_GridTableBase_SetColAttr(PyObject *self, PyObject *args, int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:GridTableBase_SetColAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColAttr(arg2,arg3); @@ -6128,12 +6456,22 @@ static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *self, PyObject int arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyGridTableBase_base_GetTypeName",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_GetTypeName",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->base_GetTypeName(arg2,arg3); @@ -6163,13 +6501,23 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje bool result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:PyGridTableBase_base_CanGetValueAs",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_CanGetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -6182,7 +6530,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -6206,13 +6554,23 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje bool result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:PyGridTableBase_base_CanSetValueAs",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_CanSetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -6225,7 +6583,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -6281,13 +6639,13 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6298,7 +6656,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6320,7 +6678,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -6331,7 +6689,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6355,13 +6713,13 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6372,7 +6730,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6396,13 +6754,13 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6413,7 +6771,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6435,7 +6793,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -6446,7 +6804,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6470,13 +6828,13 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6487,7 +6845,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6500,12 +6858,17 @@ static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *self, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyGridTableBase_base_GetRowLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_base_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->base_GetRowLabelValue(arg2); @@ -6532,12 +6895,17 @@ static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *self, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyGridTableBase_base_GetColLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_base_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->base_GetColLabelValue(arg2); @@ -6565,13 +6933,18 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *self, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyGridTableBase_base_SetRowLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -6606,13 +6979,18 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *self, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:PyGridTableBase_base_SetColLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -6658,7 +7036,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6673,12 +7051,27 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *self, PyObject *ar int arg4 ; wxGridCellAttr *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:PyGridTableBase_base_GetAttr",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxGridCellAttr::wxAttrKind) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellAttr *)(arg1)->base_GetAttr(arg2,arg3,(wxGridCellAttr::wxAttrKind )arg4); @@ -6703,13 +7096,23 @@ static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *self, PyObject *ar int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:PyGridTableBase_base_SetAttr",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetAttr(arg2,arg3,arg4); @@ -6731,13 +7134,18 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyGridTableBase_base_SetRowAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetRowAttr(arg2,arg3); @@ -6759,13 +7167,18 @@ static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *self, PyObject int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:PyGridTableBase_base_SetColAttr",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetColAttr(arg2,arg3); @@ -6792,11 +7205,25 @@ static PyObject *_wrap_new_GridStringTable(PyObject *self, PyObject *args, PyObj int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxGridStringTable *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "numRows",(char *) "numCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridStringTable",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridStringTable",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridStringTable *)new wxGridStringTable(arg1,arg2); @@ -6826,12 +7253,31 @@ static PyObject *_wrap_new_GridTableMessage(PyObject *self, PyObject *args, PyOb int arg4 = (int) -1 ; wxGridTableMessage *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "table",(char *) "id",(char *) "comInt1",(char *) "comInt2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_GridTableMessage",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_GridTableMessage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridTableMessage *)new wxGridTableMessage(arg1,arg2,arg3,arg4); @@ -6929,12 +7375,17 @@ static PyObject *_wrap_GridTableMessage_SetId(PyObject *self, PyObject *args, Py wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableMessage_SetId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableMessage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetId(arg2); @@ -6967,7 +7418,7 @@ static PyObject *_wrap_GridTableMessage_GetId(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6979,12 +7430,17 @@ static PyObject *_wrap_GridTableMessage_SetCommandInt(PyObject *self, PyObject * wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "comInt1", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableMessage_SetCommandInt",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetCommandInt",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableMessage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCommandInt(arg2); @@ -7017,7 +7473,7 @@ static PyObject *_wrap_GridTableMessage_GetCommandInt(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7029,12 +7485,17 @@ static PyObject *_wrap_GridTableMessage_SetCommandInt2(PyObject *self, PyObject wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "comInt2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridTableMessage_SetCommandInt2",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetCommandInt2",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridTableMessage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCommandInt2(arg2); @@ -7067,7 +7528,7 @@ static PyObject *_wrap_GridTableMessage_GetCommandInt2(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7086,11 +7547,25 @@ static PyObject *_wrap_new_GridCellCoords(PyObject *self, PyObject *args, PyObje int arg1 = (int) -1 ; int arg2 = (int) -1 ; wxGridCellCoords *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "r",(char *) "c", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_GridCellCoords",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellCoords",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellCoords *)new wxGridCellCoords(arg1,arg2); @@ -7147,7 +7622,7 @@ static PyObject *_wrap_GridCellCoords_GetRow(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7159,12 +7634,17 @@ static PyObject *_wrap_GridCellCoords_SetRow(PyObject *self, PyObject *args, PyO wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellCoords_SetRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords_SetRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRow(arg2); @@ -7197,7 +7677,7 @@ static PyObject *_wrap_GridCellCoords_GetCol(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7209,12 +7689,17 @@ static PyObject *_wrap_GridCellCoords_SetCol(PyObject *self, PyObject *args, PyO wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridCellCoords_SetCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords_SetCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCol(arg2); @@ -7235,12 +7720,22 @@ static PyObject *_wrap_GridCellCoords_Set(PyObject *self, PyObject *args, PyObje int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:GridCellCoords_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellCoords_Set",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set(arg2,arg3); @@ -7279,7 +7774,7 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7310,7 +7805,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7365,15 +7860,21 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs 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 *)"Oi|OOlO:new_Grid",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Grid",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -7386,6 +7887,12 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -7425,12 +7932,29 @@ static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject WXGRIDSELECTIONMODES arg4 = (WXGRIDSELECTIONMODES) wxGrid::wxGridSelectCells ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numRows",(char *) "numCols",(char *) "selmode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:Grid_CreateGrid",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_CreateGrid",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (WXGRIDSELECTIONMODES) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->CreateGrid(arg2,arg3,arg4); @@ -7438,7 +7962,7 @@ static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7450,12 +7974,17 @@ static PyObject *_wrap_Grid_SetSelectionMode(PyObject *self, PyObject *args, PyO wxGrid *arg1 = (wxGrid *) 0 ; WXGRIDSELECTIONMODES arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "selmode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetSelectionMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetSelectionMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (WXGRIDSELECTIONMODES) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelectionMode(arg2); @@ -7488,7 +8017,7 @@ static PyObject *_wrap_Grid_GetSelectionMode(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7513,7 +8042,7 @@ static PyObject *_wrap_Grid_GetNumberRows(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7538,7 +8067,7 @@ static PyObject *_wrap_Grid_GetNumberCols(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7569,7 +8098,7 @@ static PyObject *_wrap_Grid_ProcessTableMessage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7613,16 +8142,23 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "table",(char *) "takeOwnership",(char *) "selmode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|Oi:Grid_SetTable",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Grid_SetTable",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridTableBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (WXGRIDSELECTIONMODES) SWIG_PyObj_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7633,7 +8169,7 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7672,16 +8208,30 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numRows",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiO:Grid_InsertRows",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Grid_InsertRows",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7692,7 +8242,7 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7706,16 +8256,23 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject bool arg3 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numRows",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Grid_AppendRows",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Grid_AppendRows",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7726,7 +8283,7 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7741,16 +8298,30 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numRows",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiO:Grid_DeleteRows",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Grid_DeleteRows",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7761,7 +8332,7 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7776,16 +8347,30 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numCols",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiO:Grid_InsertCols",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Grid_InsertCols",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7796,7 +8381,7 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7810,16 +8395,23 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject bool arg3 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numCols",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Grid_AppendCols",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Grid_AppendCols",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -7830,7 +8422,7 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7845,16 +8437,30 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos",(char *) "numCols",(char *) "updateLabels", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiO:Grid_DeleteCols",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Grid_DeleteCols",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7865,7 +8471,7 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7920,11 +8526,14 @@ static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, Py PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc","arg3","arg4",(char *) "horizontalAlignment",(char *) "verticalAlignment",(char *) "textOrientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|iii:Grid_DrawTextRectangle",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:Grid_DrawTextRectangle",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -7939,6 +8548,24 @@ static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, Py arg4 = &temp4; if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawTextRectangle(*arg2,(wxString const &)*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); @@ -8098,7 +8725,7 @@ static PyObject *_wrap_Grid_GetBatchCount(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8145,7 +8772,7 @@ static PyObject *_wrap_Grid_Refresh(PyObject *self, PyObject *args, PyObject *kw if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -8184,7 +8811,7 @@ static PyObject *_wrap_Grid_IsEditable(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8204,7 +8831,7 @@ static PyObject *_wrap_Grid_EnableEditing(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_EnableEditing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8235,7 +8862,7 @@ static PyObject *_wrap_Grid_EnableCellEditControl(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -8295,7 +8922,7 @@ static PyObject *_wrap_Grid_CanEnableCellControl(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8320,7 +8947,7 @@ static PyObject *_wrap_Grid_IsCellEditControlEnabled(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8345,7 +8972,7 @@ static PyObject *_wrap_Grid_IsCellEditControlShown(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8370,7 +8997,7 @@ static PyObject *_wrap_Grid_IsCurrentCellReadOnly(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8456,12 +9083,22 @@ static PyObject *_wrap_Grid_XYToCell(PyObject *self, PyObject *args, PyObject *k int arg3 ; wxGridCellCoords 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 *)"Oii:Grid_XYToCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_XYToCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxGrid_XYToCell(arg1,arg2,arg3); @@ -8486,12 +9123,17 @@ static PyObject *_wrap_Grid_YToRow(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_YToRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_YToRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->YToRow(arg2); @@ -8499,7 +9141,7 @@ static PyObject *_wrap_Grid_YToRow(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8512,12 +9154,17 @@ static PyObject *_wrap_Grid_XToCol(PyObject *self, PyObject *args, PyObject *kwa int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_XToCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_XToCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->XToCol(arg2); @@ -8525,7 +9172,7 @@ static PyObject *_wrap_Grid_XToCol(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8538,12 +9185,17 @@ static PyObject *_wrap_Grid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObjec int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_YToEdgeOfRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_YToEdgeOfRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->YToEdgeOfRow(arg2); @@ -8551,7 +9203,7 @@ static PyObject *_wrap_Grid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8564,12 +9216,17 @@ static PyObject *_wrap_Grid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObjec int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_XToEdgeOfCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_XToEdgeOfCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->XToEdgeOfCol(arg2); @@ -8577,7 +9234,7 @@ static PyObject *_wrap_Grid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8591,12 +9248,22 @@ static PyObject *_wrap_Grid_CellToRect(PyObject *self, PyObject *args, PyObject int arg3 ; wxRect result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_CellToRect",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_CellToRect",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->CellToRect(arg2,arg3); @@ -8633,7 +9300,7 @@ static PyObject *_wrap_Grid_GetGridCursorRow(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8658,7 +9325,7 @@ static PyObject *_wrap_Grid_GetGridCursorCol(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8673,16 +9340,26 @@ static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject * bool arg4 = (bool) True ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "wholeCellVisible", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Grid_IsVisible",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_IsVisible",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -8693,7 +9370,7 @@ static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8706,12 +9383,22 @@ static PyObject *_wrap_Grid_MakeCellVisible(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_MakeCellVisible",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_MakeCellVisible",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->MakeCellVisible(arg2,arg3); @@ -8732,12 +9419,22 @@ static PyObject *_wrap_Grid_SetGridCursor(PyObject *self, PyObject *args, PyObje int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetGridCursor",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetGridCursor",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetGridCursor(arg2,arg3); @@ -8766,7 +9463,7 @@ static PyObject *_wrap_Grid_MoveCursorUp(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorUp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8776,7 +9473,7 @@ static PyObject *_wrap_Grid_MoveCursorUp(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8797,7 +9494,7 @@ static PyObject *_wrap_Grid_MoveCursorDown(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8807,7 +9504,7 @@ static PyObject *_wrap_Grid_MoveCursorDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8828,7 +9525,7 @@ static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorLeft",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8838,7 +9535,7 @@ static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8859,7 +9556,7 @@ static PyObject *_wrap_Grid_MoveCursorRight(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorRight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8869,7 +9566,7 @@ static PyObject *_wrap_Grid_MoveCursorRight(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8894,7 +9591,7 @@ static PyObject *_wrap_Grid_MovePageDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8919,7 +9616,7 @@ static PyObject *_wrap_Grid_MovePageUp(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8940,7 +9637,7 @@ static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorUpBlock",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8950,7 +9647,7 @@ static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8971,7 +9668,7 @@ static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorDownBlock",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8981,7 +9678,7 @@ static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9002,7 +9699,7 @@ static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorLeftBlock",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9012,7 +9709,7 @@ static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9033,7 +9730,7 @@ static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorRightBlock",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9043,7 +9740,7 @@ static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9068,7 +9765,7 @@ static PyObject *_wrap_Grid_GetDefaultRowLabelSize(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9093,7 +9790,7 @@ static PyObject *_wrap_Grid_GetRowLabelSize(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9118,7 +9815,7 @@ static PyObject *_wrap_Grid_GetDefaultColLabelSize(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9143,7 +9840,7 @@ static PyObject *_wrap_Grid_GetColLabelSize(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9331,7 +10028,7 @@ static PyObject *_wrap_Grid_GetColLabelTextOrientation(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9344,12 +10041,17 @@ static PyObject *_wrap_Grid_GetRowLabelValue(PyObject *self, PyObject *args, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_GetRowLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetRowLabelValue(arg2); @@ -9376,12 +10078,17 @@ static PyObject *_wrap_Grid_GetColLabelValue(PyObject *self, PyObject *args, PyO int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_GetColLabelValue",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetColLabelValue(arg2); @@ -9478,7 +10185,7 @@ static PyObject *_wrap_Grid_GetCellHighlightPenWidth(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9503,7 +10210,7 @@ static PyObject *_wrap_Grid_GetCellHighlightROPenWidth(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9515,12 +10222,17 @@ static PyObject *_wrap_Grid_SetRowLabelSize(PyObject *self, PyObject *args, PyOb wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetRowLabelSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetRowLabelSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowLabelSize(arg2); @@ -9540,12 +10252,17 @@ static PyObject *_wrap_Grid_SetColLabelSize(PyObject *self, PyObject *args, PyOb wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColLabelSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColLabelSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColLabelSize(arg2); @@ -9658,12 +10375,22 @@ static PyObject *_wrap_Grid_SetRowLabelAlignment(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "horiz",(char *) "vert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetRowLabelAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowLabelAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowLabelAlignment(arg2,arg3); @@ -9684,12 +10411,22 @@ static PyObject *_wrap_Grid_SetColLabelAlignment(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "horiz",(char *) "vert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetColLabelAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColLabelAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColLabelAlignment(arg2,arg3); @@ -9709,12 +10446,17 @@ static PyObject *_wrap_Grid_SetColLabelTextOrientation(PyObject *self, PyObject wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "textOrientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColLabelTextOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColLabelTextOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColLabelTextOrientation(arg2); @@ -9736,13 +10478,18 @@ static PyObject *_wrap_Grid_SetRowLabelValue(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row","arg3", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetRowLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -9777,13 +10524,18 @@ static PyObject *_wrap_Grid_SetColLabelValue(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col","arg3", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetColLabelValue",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -9878,12 +10630,17 @@ static PyObject *_wrap_Grid_SetCellHighlightPenWidth(PyObject *self, PyObject *a wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetCellHighlightPenWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetCellHighlightPenWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCellHighlightPenWidth(arg2); @@ -9903,12 +10660,17 @@ static PyObject *_wrap_Grid_SetCellHighlightROPenWidth(PyObject *self, PyObject wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetCellHighlightROPenWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetCellHighlightROPenWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCellHighlightROPenWidth(arg2); @@ -9937,7 +10699,7 @@ static PyObject *_wrap_Grid_EnableDragRowSize(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -9997,7 +10759,7 @@ static PyObject *_wrap_Grid_CanDragRowSize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10018,7 +10780,7 @@ static PyObject *_wrap_Grid_EnableDragColSize(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -10078,7 +10840,7 @@ static PyObject *_wrap_Grid_CanDragColSize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10099,7 +10861,7 @@ static PyObject *_wrap_Grid_EnableDragGridSize(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -10159,7 +10921,7 @@ static PyObject *_wrap_Grid_CanDragGridSize(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10173,13 +10935,23 @@ static PyObject *_wrap_Grid_SetAttr(PyObject *self, PyObject *args, PyObject *kw int arg3 ; wxGridCellAttr *arg4 = (wxGridCellAttr *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "attr", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetAttr",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10201,13 +10973,18 @@ static PyObject *_wrap_Grid_SetRowAttr(PyObject *self, PyObject *args, PyObject int arg2 ; wxGridCellAttr *arg3 = (wxGridCellAttr *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "attr", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetRowAttr",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10229,13 +11006,18 @@ static PyObject *_wrap_Grid_SetColAttr(PyObject *self, PyObject *args, PyObject int arg2 ; wxGridCellAttr *arg3 = (wxGridCellAttr *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "attr", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetColAttr",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGridCellAttr,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10256,12 +11038,17 @@ static PyObject *_wrap_Grid_SetColFormatBool(PyObject *self, PyObject *args, PyO wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColFormatBool",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColFormatBool",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColFormatBool(arg2); @@ -10281,12 +11068,17 @@ static PyObject *_wrap_Grid_SetColFormatNumber(PyObject *self, PyObject *args, P wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColFormatNumber",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColFormatNumber",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColFormatNumber(arg2); @@ -10308,12 +11100,31 @@ static PyObject *_wrap_Grid_SetColFormatFloat(PyObject *self, PyObject *args, Py int arg3 = (int) -1 ; int arg4 = (int) -1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "width",(char *) "precision", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:Grid_SetColFormatFloat",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Grid_SetColFormatFloat",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColFormatFloat(arg2,arg3,arg4); @@ -10335,13 +11146,18 @@ static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *self, PyObject *args, P wxString *arg3 = 0 ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Grid_SetColFormatCustom",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColFormatCustom",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -10383,7 +11199,7 @@ static PyObject *_wrap_Grid_EnableGridLines(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -10419,7 +11235,7 @@ static PyObject *_wrap_Grid_GridLinesEnabled(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10444,7 +11260,7 @@ static PyObject *_wrap_Grid_GetDefaultRowSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10457,12 +11273,17 @@ static PyObject *_wrap_Grid_GetRowSize(PyObject *self, PyObject *args, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_GetRowSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetRowSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetRowSize(arg2); @@ -10470,7 +11291,7 @@ static PyObject *_wrap_Grid_GetRowSize(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10495,7 +11316,7 @@ static PyObject *_wrap_Grid_GetDefaultColSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10508,12 +11329,17 @@ static PyObject *_wrap_Grid_GetColSize(PyObject *self, PyObject *args, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_GetColSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetColSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetColSize(arg2); @@ -10521,7 +11347,7 @@ static PyObject *_wrap_Grid_GetColSize(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10564,12 +11390,22 @@ static PyObject *_wrap_Grid_GetCellBackgroundColour(PyObject *self, PyObject *ar int arg3 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellBackgroundColour",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellBackgroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCellBackgroundColour(arg2,arg3); @@ -10624,12 +11460,22 @@ static PyObject *_wrap_Grid_GetCellTextColour(PyObject *self, PyObject *args, Py int arg3 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellTextColour",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCellTextColour(arg2,arg3); @@ -10684,12 +11530,22 @@ static PyObject *_wrap_Grid_GetCellFont(PyObject *self, PyObject *args, PyObject int arg3 ; wxFont result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellFont",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellFont",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCellFont(arg2,arg3); @@ -10756,14 +11612,24 @@ static PyObject *_wrap_Grid_GetCellAlignment(PyObject *self, PyObject *args, PyO int temp4 ; int temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetCellAlignment(arg2,arg3,arg4,arg5); @@ -10804,7 +11670,7 @@ static PyObject *_wrap_Grid_GetDefaultCellOverflow(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10818,12 +11684,22 @@ static PyObject *_wrap_Grid_GetCellOverflow(PyObject *self, PyObject *args, PyOb int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellOverflow",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellOverflow",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetCellOverflow(arg2,arg3); @@ -10831,7 +11707,7 @@ static PyObject *_wrap_Grid_GetCellOverflow(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10848,14 +11724,24 @@ static PyObject *_wrap_Grid_GetCellSize(PyObject *self, PyObject *args, PyObject int temp4 ; int temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->GetCellSize(arg2,arg3,arg4,arg5); @@ -10884,16 +11770,21 @@ static PyObject *_wrap_Grid_SetDefaultRowSize(PyObject *self, PyObject *args, Py int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height",(char *) "resizeExistingRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_SetDefaultRowSize",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SetDefaultRowSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10917,12 +11808,22 @@ static PyObject *_wrap_Grid_SetRowSize(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetRowSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowSize(arg2,arg3); @@ -10943,16 +11844,21 @@ static PyObject *_wrap_Grid_SetDefaultColSize(PyObject *self, PyObject *args, Py int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "resizeExistingCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_SetDefaultColSize",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SetDefaultColSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10976,12 +11882,22 @@ static PyObject *_wrap_Grid_SetColSize(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetColSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColSize(arg2,arg3); @@ -11002,16 +11918,21 @@ static PyObject *_wrap_Grid_AutoSizeColumn(PyObject *self, PyObject *args, PyObj int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "setAsMin", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_AutoSizeColumn",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_AutoSizeColumn",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -11035,16 +11956,21 @@ static PyObject *_wrap_Grid_AutoSizeRow(PyObject *self, PyObject *args, PyObject int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "setAsMin", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_AutoSizeRow",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_AutoSizeRow",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -11076,7 +12002,7 @@ static PyObject *_wrap_Grid_AutoSizeColumns(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -11108,7 +12034,7 @@ static PyObject *_wrap_Grid_AutoSizeRows(PyObject *self, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -11155,12 +12081,17 @@ static PyObject *_wrap_Grid_AutoSizeRowLabelSize(PyObject *self, PyObject *args, wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_AutoSizeRowLabelSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_AutoSizeRowLabelSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AutoSizeRowLabelSize(arg2); @@ -11180,12 +12111,17 @@ static PyObject *_wrap_Grid_AutoSizeColLabelSize(PyObject *self, PyObject *args, wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_AutoSizeColLabelSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_AutoSizeColLabelSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AutoSizeColLabelSize(arg2); @@ -11206,12 +12142,22 @@ static PyObject *_wrap_Grid_SetColMinimalWidth(PyObject *self, PyObject *args, P int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetColMinimalWidth",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColMinimalWidth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColMinimalWidth(arg2,arg3); @@ -11232,12 +12178,22 @@ static PyObject *_wrap_Grid_SetRowMinimalHeight(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetRowMinimalHeight",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowMinimalHeight",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowMinimalHeight(arg2,arg3); @@ -11257,12 +12213,17 @@ static PyObject *_wrap_Grid_SetColMinimalAcceptableWidth(PyObject *self, PyObjec wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetColMinimalAcceptableWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColMinimalAcceptableWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColMinimalAcceptableWidth(arg2); @@ -11282,12 +12243,17 @@ static PyObject *_wrap_Grid_SetRowMinimalAcceptableHeight(PyObject *self, PyObje wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_SetRowMinimalAcceptableHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetRowMinimalAcceptableHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRowMinimalAcceptableHeight(arg2); @@ -11320,7 +12286,7 @@ static PyObject *_wrap_Grid_GetColMinimalAcceptableWidth(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11345,7 +12311,7 @@ static PyObject *_wrap_Grid_GetRowMinimalAcceptableHeight(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11391,13 +12357,23 @@ static PyObject *_wrap_Grid_SetCellBackgroundColour(PyObject *self, PyObject *ar wxColour *arg4 = 0 ; wxColour temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col","arg4", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellBackgroundColour",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellBackgroundColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; @@ -11455,13 +12431,23 @@ static PyObject *_wrap_Grid_SetCellTextColour(PyObject *self, PyObject *args, Py wxColour *arg4 = 0 ; wxColour temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col","arg4", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellTextColour",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellTextColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; @@ -11517,13 +12503,23 @@ static PyObject *_wrap_Grid_SetCellFont(PyObject *self, PyObject *args, PyObject int arg3 ; wxFont *arg4 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col","arg4", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellFont",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellFont",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg4 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -11548,12 +12544,22 @@ static PyObject *_wrap_Grid_SetDefaultCellAlignment(PyObject *self, PyObject *ar int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "horiz",(char *) "vert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetDefaultCellAlignment",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetDefaultCellAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDefaultCellAlignment(arg2,arg3); @@ -11576,12 +12582,32 @@ static PyObject *_wrap_Grid_SetCellAlignment(PyObject *self, PyObject *args, PyO int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "horiz",(char *) "vert", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Grid_SetCellAlignment",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Grid_SetCellAlignment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCellAlignment(arg2,arg3,arg4,arg5); @@ -11609,7 +12635,7 @@ static PyObject *_wrap_Grid_SetDefaultCellOverflow(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetDefaultCellOverflow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11633,15 +12659,25 @@ static PyObject *_wrap_Grid_SetCellOverflow(PyObject *self, PyObject *args, PyOb int arg3 ; bool arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "allow", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellOverflow",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellOverflow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg4 = (bool) SPyObj_AsBool(obj3); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } { @@ -11666,12 +12702,32 @@ static PyObject *_wrap_Grid_SetCellSize(PyObject *self, PyObject *args, PyObject int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "num_rows",(char *) "num_cols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Grid_SetCellSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Grid_SetCellSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCellSize(arg2,arg3,arg4,arg5); @@ -11720,13 +12776,23 @@ static PyObject *_wrap_Grid_SetCellRenderer(PyObject *self, PyObject *args, PyOb int arg3 ; wxGridCellRenderer *arg4 = (wxGridCellRenderer *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "renderer", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellRenderer",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellRenderer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGridCellRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11776,12 +12842,22 @@ static PyObject *_wrap_Grid_GetCellRenderer(PyObject *self, PyObject *args, PyOb int arg3 ; wxGridCellRenderer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellRenderer",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellRenderer",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellRenderer *)(arg1)->GetCellRenderer(arg2,arg3); @@ -11832,13 +12908,23 @@ static PyObject *_wrap_Grid_SetCellEditor(PyObject *self, PyObject *args, PyObje int arg3 ; wxGridCellEditor *arg4 = (wxGridCellEditor *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "editor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellEditor",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellEditor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11888,12 +12974,22 @@ static PyObject *_wrap_Grid_GetCellEditor(PyObject *self, PyObject *args, PyObje int arg3 ; wxGridCellEditor *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellEditor",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellEditor",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellEditor *)(arg1)->GetCellEditor(arg2,arg3); @@ -11917,12 +13013,22 @@ static PyObject *_wrap_Grid_GetCellValue(PyObject *self, PyObject *args, PyObjec int arg3 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetCellValue",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellValue",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCellValue(arg2,arg3); @@ -11951,13 +13057,23 @@ static PyObject *_wrap_Grid_SetCellValue(PyObject *self, PyObject *args, PyObjec wxString *arg4 = 0 ; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO:Grid_SetCellValue",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellValue",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -11992,12 +13108,22 @@ static PyObject *_wrap_Grid_IsReadOnly(PyObject *self, PyObject *args, PyObject int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_IsReadOnly",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_IsReadOnly",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxGrid const *)arg1)->IsReadOnly(arg2,arg3); @@ -12005,7 +13131,7 @@ static PyObject *_wrap_Grid_IsReadOnly(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12019,16 +13145,26 @@ static PyObject *_wrap_Grid_SetReadOnly(PyObject *self, PyObject *args, PyObject int arg3 ; bool arg4 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col",(char *) "isReadOnly", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:Grid_SetReadOnly",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_SetReadOnly",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -12052,16 +13188,21 @@ static PyObject *_wrap_Grid_SelectRow(PyObject *self, PyObject *args, PyObject * int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "addToSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_SelectRow",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SelectRow",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -12085,16 +13226,21 @@ static PyObject *_wrap_Grid_SelectCol(PyObject *self, PyObject *args, PyObject * int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col",(char *) "addToSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:Grid_SelectCol",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SelectCol",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -12121,16 +13267,36 @@ static PyObject *_wrap_Grid_SelectBlock(PyObject *self, PyObject *args, PyObject int arg5 ; bool arg6 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "topRow",(char *) "leftCol",(char *) "bottomRow",(char *) "rightCol",(char *) "addToSelected", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|O:Grid_SelectBlock",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Grid_SelectBlock",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } @@ -12190,7 +13356,7 @@ static PyObject *_wrap_Grid_IsSelection(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12228,12 +13394,22 @@ static PyObject *_wrap_Grid_IsInSelection(PyObject *self, PyObject *args, PyObje int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_IsInSelection",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_IsInSelection",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsInSelection(arg2,arg3); @@ -12241,7 +13417,7 @@ static PyObject *_wrap_Grid_IsInSelection(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12400,12 +13576,17 @@ static PyObject *_wrap_Grid_DeselectRow(PyObject *self, PyObject *args, PyObject wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_DeselectRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_DeselectRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeselectRow(arg2); @@ -12425,12 +13606,17 @@ static PyObject *_wrap_Grid_DeselectCol(PyObject *self, PyObject *args, PyObject wxGrid *arg1 = (wxGrid *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Grid_DeselectCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_DeselectCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeselectCol(arg2); @@ -12451,12 +13637,22 @@ static PyObject *_wrap_Grid_DeselectCell(PyObject *self, PyObject *args, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_DeselectCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_DeselectCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DeselectCell(arg2,arg3); @@ -12687,12 +13883,22 @@ static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *self, PyObject *ar int arg3 ; wxGridCellEditor *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetDefaultEditorForCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetDefaultEditorForCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellEditor *)((wxGrid const *)arg1)->GetDefaultEditorForCell(arg2,arg3); @@ -12716,12 +13922,22 @@ static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *self, PyObject * int arg3 ; wxGridCellRenderer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_GetDefaultRendererForCell",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetDefaultRendererForCell",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGridCellRenderer *)((wxGrid const *)arg1)->GetDefaultRendererForCell(arg2,arg3); @@ -12830,12 +14046,22 @@ static PyObject *_wrap_Grid_SetMargins(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "extraWidth",(char *) "extraHeight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Grid_SetMargins",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetMargins",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -12980,7 +14206,13 @@ static PyObject *_wrap_new_GridEvent(PyObject *self, PyObject *args, PyObject *k bool arg11 = (bool) False ; bool arg12 = (bool) False ; wxGridEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; @@ -12990,35 +14222,67 @@ static PyObject *_wrap_new_GridEvent(PyObject *self, PyObject *args, PyObject *k (char *) "id",(char *) "type",(char *) "obj",(char *) "row",(char *) "col",(char *) "x",(char *) "y",(char *) "sel",(char *) "control",(char *) "shift",(char *) "alt",(char *) "meta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiO|iiiiOOOOO:new_GridEvent",kwnames,&arg1,&arg2,&obj2,&arg4,&arg5,&arg6,&arg7,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOOOO:new_GridEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { - arg8 = (bool) SPyObj_AsBool(obj7); + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { { - arg9 = (bool) SPyObj_AsBool(obj8); + arg9 = (bool) SWIG_PyObj_AsBool(obj8); if (PyErr_Occurred()) SWIG_fail; } } if (obj9) { { - arg10 = (bool) SPyObj_AsBool(obj9); + arg10 = (bool) SWIG_PyObj_AsBool(obj9); if (PyErr_Occurred()) SWIG_fail; } } if (obj10) { { - arg11 = (bool) SPyObj_AsBool(obj10); + arg11 = (bool) SWIG_PyObj_AsBool(obj10); if (PyErr_Occurred()) SWIG_fail; } } if (obj11) { { - arg12 = (bool) SPyObj_AsBool(obj11); + arg12 = (bool) SWIG_PyObj_AsBool(obj11); if (PyErr_Occurred()) SWIG_fail; } } @@ -13054,7 +14318,7 @@ static PyObject *_wrap_GridEvent_GetRow(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13079,7 +14343,7 @@ static PyObject *_wrap_GridEvent_GetCol(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13133,7 +14397,7 @@ static PyObject *_wrap_GridEvent_Selecting(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13158,7 +14422,7 @@ static PyObject *_wrap_GridEvent_ControlDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13183,7 +14447,7 @@ static PyObject *_wrap_GridEvent_MetaDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13208,7 +14472,7 @@ static PyObject *_wrap_GridEvent_ShiftDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13233,7 +14497,7 @@ static PyObject *_wrap_GridEvent_AltDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13260,7 +14524,12 @@ static PyObject *_wrap_new_GridSizeEvent(PyObject *self, PyObject *args, PyObjec bool arg9 = (bool) False ; bool arg10 = (bool) False ; wxGridSizeEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; @@ -13269,29 +14538,55 @@ static PyObject *_wrap_new_GridSizeEvent(PyObject *self, PyObject *args, PyObjec (char *) "id",(char *) "type",(char *) "obj",(char *) "rowOrCol",(char *) "x",(char *) "y",(char *) "control",(char *) "shift",(char *) "alt",(char *) "meta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiO|iiiOOOO:new_GridSizeEvent",kwnames,&arg1,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6,&obj7,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOO:new_GridSizeEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { { - arg8 = (bool) SPyObj_AsBool(obj7); + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { { - arg9 = (bool) SPyObj_AsBool(obj8); + arg9 = (bool) SWIG_PyObj_AsBool(obj8); if (PyErr_Occurred()) SWIG_fail; } } if (obj9) { { - arg10 = (bool) SPyObj_AsBool(obj9); + arg10 = (bool) SWIG_PyObj_AsBool(obj9); if (PyErr_Occurred()) SWIG_fail; } } @@ -13327,7 +14622,7 @@ static PyObject *_wrap_GridSizeEvent_GetRowOrCol(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13381,7 +14676,7 @@ static PyObject *_wrap_GridSizeEvent_ControlDown(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13406,7 +14701,7 @@ static PyObject *_wrap_GridSizeEvent_MetaDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13431,7 +14726,7 @@ static PyObject *_wrap_GridSizeEvent_ShiftDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13456,7 +14751,7 @@ static PyObject *_wrap_GridSizeEvent_AltDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13485,6 +14780,8 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args, wxGridRangeSelectEvent *result; wxGridCellCoords temp4 ; wxGridCellCoords temp5 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; @@ -13497,7 +14794,15 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args, (char *) "id",(char *) "type",(char *) "obj",(char *) "topLeft",(char *) "bottomRight",(char *) "sel",(char *) "control",(char *) "shift",(char *) "alt",(char *) "meta", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiOOO|OOOOO:new_GridRangeSelectEvent",kwnames,&arg1,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOOOO:new_GridRangeSelectEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGrid,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg4 = &temp4; @@ -13509,31 +14814,31 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args, } if (obj5) { { - arg6 = (bool) SPyObj_AsBool(obj5); + arg6 = (bool) SWIG_PyObj_AsBool(obj5); if (PyErr_Occurred()) SWIG_fail; } } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { { - arg8 = (bool) SPyObj_AsBool(obj7); + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { { - arg9 = (bool) SPyObj_AsBool(obj8); + arg9 = (bool) SWIG_PyObj_AsBool(obj8); if (PyErr_Occurred()) SWIG_fail; } } if (obj9) { { - arg10 = (bool) SPyObj_AsBool(obj9); + arg10 = (bool) SWIG_PyObj_AsBool(obj9); if (PyErr_Occurred()) SWIG_fail; } } @@ -13627,7 +14932,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetTopRow(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13652,7 +14957,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetBottomRow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13677,7 +14982,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetLeftCol(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13702,7 +15007,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetRightCol(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13727,7 +15032,7 @@ static PyObject *_wrap_GridRangeSelectEvent_Selecting(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13752,7 +15057,7 @@ static PyObject *_wrap_GridRangeSelectEvent_ControlDown(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13777,7 +15082,7 @@ static PyObject *_wrap_GridRangeSelectEvent_MetaDown(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13802,7 +15107,7 @@ static PyObject *_wrap_GridRangeSelectEvent_ShiftDown(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13827,7 +15132,7 @@ static PyObject *_wrap_GridRangeSelectEvent_AltDown(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13850,14 +15155,34 @@ static PyObject *_wrap_new_GridEditorCreatedEvent(PyObject *self, PyObject *args int arg5 ; wxControl *arg6 = (wxControl *) 0 ; wxGridEditorCreatedEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "id",(char *) "type",(char *) "obj",(char *) "row",(char *) "col",(char *) "ctrl", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiOiiO:new_GridEditorCreatedEvent",kwnames,&arg1,&arg2,&obj2,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GridEditorCreatedEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxEventType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxControl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13891,7 +15216,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_GetRow(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13916,7 +15241,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_GetCol(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13955,12 +15280,17 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetRow(PyObject *self, PyObject *a wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridEditorCreatedEvent_SetRow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridEditorCreatedEvent_SetRow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridEditorCreatedEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRow(arg2); @@ -13980,12 +15310,17 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetCol(PyObject *self, PyObject *a wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:GridEditorCreatedEvent_SetCol",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridEditorCreatedEvent_SetCol",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridEditorCreatedEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCol(arg2); @@ -15515,6 +16850,7 @@ static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0 static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}}; static swig_type_info _swigt__p_wxGridTableMessage[] = {{"_p_wxGridTableMessage", 0, "wxGridTableMessage *", 0},{"_p_wxGridTableMessage"},{0}}; static swig_type_info _swigt__p_wxGrid[] = {{"_p_wxGrid", 0, "wxGrid *", 0},{"_p_wxGrid"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxGrid", _p_wxGridTo_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_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0},{"_p_wxGridSizeEvent", _p_wxGridSizeEventTo_p_wxNotifyEvent},{"_p_wxGridRangeSelectEvent", _p_wxGridRangeSelectEventTo_p_wxNotifyEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxNotifyEvent},{"_p_wxGridEvent", _p_wxGridEventTo_p_wxNotifyEvent},{"_p_wxNotifyEvent"},{0}}; static swig_type_info _swigt__p_wxGridRangeSelectEvent[] = {{"_p_wxGridRangeSelectEvent", 0, "wxGridRangeSelectEvent *", 0},{"_p_wxGridRangeSelectEvent"},{0}}; @@ -15535,11 +16871,11 @@ static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{ static swig_type_info _swigt__p_wxGridEvent[] = {{"_p_wxGridEvent", 0, "wxGridEvent *", 0},{"_p_wxGridEvent"},{0}}; static swig_type_info _swigt__p_wxGridEditorCreatedEvent[] = {{"_p_wxGridEditorCreatedEvent", 0, "wxGridEditorCreatedEvent *", 0},{"_p_wxGridEditorCreatedEvent"},{0}}; static swig_type_info _swigt__p_wxGridTableBase[] = {{"_p_wxGridTableBase", 0, "wxGridTableBase *", 0},{"_p_wxGridStringTable", _p_wxGridStringTableTo_p_wxGridTableBase},{"_p_wxGridTableBase"},{"_p_wxPyGridTableBase", _p_wxPyGridTableBaseTo_p_wxGridTableBase},{0}}; -static swig_type_info _swigt__p_wxGridCellFloatEditor[] = {{"_p_wxGridCellFloatEditor", 0, "wxGridCellFloatEditor *", 0},{"_p_wxGridCellFloatEditor"},{0}}; static swig_type_info _swigt__p_wxGridCellNumberEditor[] = {{"_p_wxGridCellNumberEditor", 0, "wxGridCellNumberEditor *", 0},{"_p_wxGridCellNumberEditor"},{0}}; static swig_type_info _swigt__p_wxPyGridCellEditor[] = {{"_p_wxPyGridCellEditor", 0, "wxPyGridCellEditor *", 0},{"_p_wxPyGridCellEditor"},{0}}; static swig_type_info _swigt__p_wxGridCellEditor[] = {{"_p_wxGridCellEditor", 0, "wxGridCellEditor *", 0},{"_p_wxGridCellEditor"},{"_p_wxPyGridCellEditor", _p_wxPyGridCellEditorTo_p_wxGridCellEditor},{"_p_wxGridCellTextEditor", _p_wxGridCellTextEditorTo_p_wxGridCellEditor},{"_p_wxGridCellNumberEditor", _p_wxGridCellNumberEditorTo_p_wxGridCellEditor},{"_p_wxGridCellFloatEditor", _p_wxGridCellFloatEditorTo_p_wxGridCellEditor},{"_p_wxGridCellBoolEditor", _p_wxGridCellBoolEditorTo_p_wxGridCellEditor},{"_p_wxGridCellAutoWrapStringEditor", _p_wxGridCellAutoWrapStringEditorTo_p_wxGridCellEditor},{"_p_wxGridCellChoiceEditor", _p_wxGridCellChoiceEditorTo_p_wxGridCellEditor},{"_p_wxGridCellEnumEditor", _p_wxGridCellEnumEditorTo_p_wxGridCellEditor},{0}}; static swig_type_info _swigt__p_wxGridCellTextEditor[] = {{"_p_wxGridCellTextEditor", 0, "wxGridCellTextEditor *", 0},{"_p_wxGridCellTextEditor"},{"_p_wxGridCellNumberEditor", _p_wxGridCellNumberEditorTo_p_wxGridCellTextEditor},{"_p_wxGridCellFloatEditor", _p_wxGridCellFloatEditorTo_p_wxGridCellTextEditor},{"_p_wxGridCellAutoWrapStringEditor", _p_wxGridCellAutoWrapStringEditorTo_p_wxGridCellTextEditor},{0}}; +static swig_type_info _swigt__p_wxGridCellFloatEditor[] = {{"_p_wxGridCellFloatEditor", 0, "wxGridCellFloatEditor *", 0},{"_p_wxGridCellFloatEditor"},{0}}; static swig_type_info _swigt__p_wxGridCellBoolEditor[] = {{"_p_wxGridCellBoolEditor", 0, "wxGridCellBoolEditor *", 0},{"_p_wxGridCellBoolEditor"},{0}}; static swig_type_info _swigt__p_wxPyGridTableBase[] = {{"_p_wxPyGridTableBase", 0, "wxPyGridTableBase *", 0},{"_p_wxPyGridTableBase"},{0}}; static swig_type_info _swigt__p_wxGridStringTable[] = {{"_p_wxGridStringTable", 0, "wxGridStringTable *", 0},{"_p_wxGridStringTable"},{0}}; @@ -15568,6 +16904,7 @@ _swigt__p_wxColour, _swigt__p_wxDC, _swigt__p_wxGridTableMessage, _swigt__p_wxGrid, +_swigt__p_char, _swigt__p_wxPanel, _swigt__p_wxNotifyEvent, _swigt__p_wxGridRangeSelectEvent, @@ -15588,11 +16925,11 @@ _swigt__p_wxPoint, _swigt__p_wxGridEvent, _swigt__p_wxGridEditorCreatedEvent, _swigt__p_wxGridTableBase, -_swigt__p_wxGridCellFloatEditor, _swigt__p_wxGridCellNumberEditor, _swigt__p_wxPyGridCellEditor, _swigt__p_wxGridCellEditor, _swigt__p_wxGridCellTextEditor, +_swigt__p_wxGridCellFloatEditor, _swigt__p_wxGridCellBoolEditor, _swigt__p_wxPyGridTableBase, _swigt__p_wxGridStringTable, @@ -15621,39 +16958,6 @@ static swig_const_info swig_const_table[] = { { SWIG_PY_STRING, (char*)"GRID_VALUE_LONG", 0, 0, (void *)"long", 0}, { SWIG_PY_STRING, (char*)"GRID_VALUE_CHOICEINT", 0, 0, (void *)"choiceint", 0}, { SWIG_PY_STRING, (char*)"GRID_VALUE_DATETIME", 0, 0, (void *)"datetime", 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Any", (long) wxGridCellAttr::Any, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Default", (long) wxGridCellAttr::Default, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Cell", (long) wxGridCellAttr::Cell, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Row", (long) wxGridCellAttr::Row, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Col", (long) wxGridCellAttr::Col, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GridCellAttr_Merged", (long) wxGridCellAttr::Merged, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_REQUEST_VIEW_GET_VALUES", (long) wxGRIDTABLE_REQUEST_VIEW_GET_VALUES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_REQUEST_VIEW_SEND_VALUES", (long) wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_ROWS_INSERTED", (long) wxGRIDTABLE_NOTIFY_ROWS_INSERTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_ROWS_APPENDED", (long) wxGRIDTABLE_NOTIFY_ROWS_APPENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_ROWS_DELETED", (long) wxGRIDTABLE_NOTIFY_ROWS_DELETED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_COLS_INSERTED", (long) wxGRIDTABLE_NOTIFY_COLS_INSERTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_COLS_APPENDED", (long) wxGRIDTABLE_NOTIFY_COLS_APPENDED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"GRIDTABLE_NOTIFY_COLS_DELETED", (long) wxGRIDTABLE_NOTIFY_COLS_DELETED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Grid_wxGridSelectCells", (long) wxGrid::wxGridSelectCells, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Grid_wxGridSelectRows", (long) wxGrid::wxGridSelectRows, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Grid_wxGridSelectColumns", (long) wxGrid::wxGridSelectColumns, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_LEFT_CLICK", (long) wxEVT_GRID_CELL_LEFT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_RIGHT_CLICK", (long) wxEVT_GRID_CELL_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_LEFT_DCLICK", (long) wxEVT_GRID_CELL_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_RIGHT_DCLICK", (long) wxEVT_GRID_CELL_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_LABEL_LEFT_CLICK", (long) wxEVT_GRID_LABEL_LEFT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_LABEL_RIGHT_CLICK", (long) wxEVT_GRID_LABEL_RIGHT_CLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_LABEL_LEFT_DCLICK", (long) wxEVT_GRID_LABEL_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_LABEL_RIGHT_DCLICK", (long) wxEVT_GRID_LABEL_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_ROW_SIZE", (long) wxEVT_GRID_ROW_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_COL_SIZE", (long) wxEVT_GRID_COL_SIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_RANGE_SELECT", (long) wxEVT_GRID_RANGE_SELECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_CELL_CHANGE", (long) wxEVT_GRID_CELL_CHANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_SELECT_CELL", (long) wxEVT_GRID_SELECT_CELL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_EDITOR_SHOWN", (long) wxEVT_GRID_EDITOR_SHOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_EDITOR_HIDDEN", (long) wxEVT_GRID_EDITOR_HIDDEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_GRID_EDITOR_CREATED", (long) wxEVT_GRID_EDITOR_CREATED, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -15684,6 +16988,23 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"DateTimeFormatStr",_wrap_DateTimeFormatStr_get, _wrap_DateTimeFormatStr_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set); + PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_PyObj_FromInt((int)wxGridCellAttr::Any)); + PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_PyObj_FromInt((int)wxGridCellAttr::Default)); + PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_PyObj_FromInt((int)wxGridCellAttr::Cell)); + PyDict_SetItemString(d,"GridCellAttr_Row", SWIG_PyObj_FromInt((int)wxGridCellAttr::Row)); + PyDict_SetItemString(d,"GridCellAttr_Col", SWIG_PyObj_FromInt((int)wxGridCellAttr::Col)); + PyDict_SetItemString(d,"GridCellAttr_Merged", SWIG_PyObj_FromInt((int)wxGridCellAttr::Merged)); + PyDict_SetItemString(d,"GRIDTABLE_REQUEST_VIEW_GET_VALUES", SWIG_PyObj_FromInt((int)wxGRIDTABLE_REQUEST_VIEW_GET_VALUES)); + PyDict_SetItemString(d,"GRIDTABLE_REQUEST_VIEW_SEND_VALUES", SWIG_PyObj_FromInt((int)wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_INSERTED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_INSERTED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_APPENDED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_APPENDED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_DELETED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_DELETED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_INSERTED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_INSERTED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_APPENDED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_APPENDED)); + PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_DELETED", SWIG_PyObj_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_DELETED)); + PyDict_SetItemString(d,"Grid_wxGridSelectCells", SWIG_PyObj_FromInt((int)wxGrid::wxGridSelectCells)); + PyDict_SetItemString(d,"Grid_wxGridSelectRows", SWIG_PyObj_FromInt((int)wxGrid::wxGridSelectRows)); + PyDict_SetItemString(d,"Grid_wxGridSelectColumns", SWIG_PyObj_FromInt((int)wxGrid::wxGridSelectColumns)); PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_CLICK)); PyDict_SetItemString(d, "wxEVT_GRID_CELL_RIGHT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_RIGHT_CLICK)); PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_DCLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_DCLICK)); diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp index 823b48ae0b..d1d706a393 100644 --- a/wxPython/src/msw/html_wrap.cpp +++ b/wxPython/src/msw/html_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -390,49 +239,50 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxMouseEvent swig_types[6] #define SWIGTYPE_p_wxHtmlWordCell swig_types[7] #define SWIGTYPE_p_wxHtmlHelpData swig_types[8] -#define SWIGTYPE_p_wxHtmlWinParser swig_types[9] -#define SWIGTYPE_p_wxHtmlParser swig_types[10] -#define SWIGTYPE_p_wxPanel swig_types[11] -#define SWIGTYPE_p_wxHtmlFontCell swig_types[12] +#define SWIGTYPE_p_char swig_types[9] +#define SWIGTYPE_p_wxHtmlWinParser swig_types[10] +#define SWIGTYPE_p_wxHtmlParser swig_types[11] +#define SWIGTYPE_p_wxPanel swig_types[12] #define SWIGTYPE_p_wxFont swig_types[13] #define SWIGTYPE_p_wxHtmlColourCell swig_types[14] #define SWIGTYPE_p_wxPyHtmlWindow swig_types[15] #define SWIGTYPE_p_wxScrolledWindow swig_types[16] #define SWIGTYPE_p_wxWindow swig_types[17] #define SWIGTYPE_p_wxTopLevelWindow swig_types[18] -#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[19] -#define SWIGTYPE_p_wxHtmlSelection swig_types[20] -#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[21] -#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[22] -#define SWIGTYPE_p_wxObject swig_types[23] -#define SWIGTYPE_p_wxString swig_types[24] -#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[25] -#define SWIGTYPE_p_wxHtmlTagHandler swig_types[26] -#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[27] -#define SWIGTYPE_p_wxEvtHandler swig_types[28] -#define SWIGTYPE_p_wxPoint swig_types[29] -#define SWIGTYPE_p_wxHtmlHelpController swig_types[30] -#define SWIGTYPE_p_wxCursor swig_types[31] -#define SWIGTYPE_p_wxFileSystem swig_types[32] -#define SWIGTYPE_p_wxHtmlBookRecArray swig_types[33] -#define SWIGTYPE_p_wxPyPrintout swig_types[34] -#define SWIGTYPE_p_wxHtmlPrintout swig_types[35] -#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[36] -#define SWIGTYPE_p_wxHtmlContentsItem swig_types[37] -#define SWIGTYPE_p_wxConfigBase swig_types[38] -#define SWIGTYPE_p_wxPrintData swig_types[39] -#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[40] -#define SWIGTYPE_p_wxHtmlRenderingState swig_types[41] -#define SWIGTYPE_p_wxFrame swig_types[42] -#define SWIGTYPE_p_wxPyHtmlFilter swig_types[43] -#define SWIGTYPE_p_wxHtmlFilter swig_types[44] -#define SWIGTYPE_p_wxHtmlCell swig_types[45] -#define SWIGTYPE_p_wxHtmlContainerCell swig_types[46] -#define SWIGTYPE_p_wxHtmlTag swig_types[47] -#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[48] -#define SWIGTYPE_p_int swig_types[49] -#define SWIGTYPE_p_wxHtmlBookRecord swig_types[50] -static swig_type_info *swig_types[52]; +#define SWIGTYPE_p_wxHtmlFontCell swig_types[19] +#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[20] +#define SWIGTYPE_p_wxHtmlSelection swig_types[21] +#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[22] +#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[23] +#define SWIGTYPE_p_wxObject swig_types[24] +#define SWIGTYPE_p_wxString swig_types[25] +#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[26] +#define SWIGTYPE_p_wxHtmlTagHandler swig_types[27] +#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[28] +#define SWIGTYPE_p_wxEvtHandler swig_types[29] +#define SWIGTYPE_p_wxPoint swig_types[30] +#define SWIGTYPE_p_wxHtmlHelpController swig_types[31] +#define SWIGTYPE_p_wxCursor swig_types[32] +#define SWIGTYPE_p_wxFileSystem swig_types[33] +#define SWIGTYPE_p_wxHtmlBookRecArray swig_types[34] +#define SWIGTYPE_p_wxPyPrintout swig_types[35] +#define SWIGTYPE_p_wxHtmlPrintout swig_types[36] +#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[37] +#define SWIGTYPE_p_wxHtmlContentsItem swig_types[38] +#define SWIGTYPE_p_wxConfigBase swig_types[39] +#define SWIGTYPE_p_wxPrintData swig_types[40] +#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[41] +#define SWIGTYPE_p_wxHtmlRenderingState swig_types[42] +#define SWIGTYPE_p_wxFrame swig_types[43] +#define SWIGTYPE_p_wxPyHtmlFilter swig_types[44] +#define SWIGTYPE_p_wxHtmlFilter swig_types[45] +#define SWIGTYPE_p_wxHtmlCell swig_types[46] +#define SWIGTYPE_p_wxHtmlContainerCell swig_types[47] +#define SWIGTYPE_p_wxHtmlTag swig_types[48] +#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[49] +#define SWIGTYPE_p_int swig_types[50] +#define SWIGTYPE_p_wxHtmlBookRecord swig_types[51] +static swig_type_info *swig_types[53]; /* -------- TYPES TABLE (END) -------- */ @@ -444,6 +294,44 @@ static swig_type_info *swig_types[52]; #define SWIG_name "_html" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/pyistream.h" @@ -458,6 +346,23 @@ static swig_type_info *swig_types[52]; static const wxString wxPyHtmlWindowNameStr(wxT("htmlWindow")); static const wxString wxPyHtmlPrintoutTitleStr(wxT("Printout")); static const wxString wxPyHtmlPrintingTitleStr(wxT("Printing")); + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + void wxHtmlWinParser_SetFonts(wxHtmlWinParser *self,wxString normal_face,wxString fixed_face,PyObject *sizes){ int* temp = NULL; if (sizes) temp = int_LIST_helper(sizes); @@ -592,6 +497,32 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + // here's the C++ version class wxPyHtmlFilter : public wxHtmlFilter { DECLARE_ABSTRACT_CLASS(wxPyHtmlFilter); @@ -750,6 +681,29 @@ void wxHtmlPrintout_SetFonts(wxHtmlPrintout *self,wxString normal_face,wxString if (temp) delete [] temp; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + + +SWIGSTATIC(float) +SWIG_PyObj_AsFloat(PyObject *obj) +{ + return SWIG_PyObj_AsFloatConv(obj, SWIG_PyObj_AsDouble); +} + void wxHtmlEasyPrinting_SetFonts(wxHtmlEasyPrinting *self,wxString normal_face,wxString fixed_face,PyObject *sizes){ int* temp = NULL; if (sizes) temp = int_LIST_helper(sizes); @@ -765,7 +719,7 @@ wxHtmlBookRecord *wxHtmlContentsItem_GetBook(wxHtmlContentsItem *self){ return s #ifdef __cplusplus extern "C" { #endif -static int _wrap_HtmlWindowNameStr_set(PyObject *_val) { +static int _wrap_HtmlWindowNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable HtmlWindowNameStr is read-only."); return 1; } @@ -785,7 +739,7 @@ static PyObject *_wrap_HtmlWindowNameStr_get() { } -static int _wrap_HtmlPrintoutTitleStr_set(PyObject *_val) { +static int _wrap_HtmlPrintoutTitleStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintoutTitleStr is read-only."); return 1; } @@ -805,7 +759,7 @@ static PyObject *_wrap_HtmlPrintoutTitleStr_get() { } -static int _wrap_HtmlPrintingTitleStr_set(PyObject *_val) { +static int _wrap_HtmlPrintingTitleStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintingTitleStr is read-only."); return 1; } @@ -1114,7 +1068,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -1138,17 +1092,24 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "par",(char *) "with_commas", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlTag_GetParam",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlTag_GetParam",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlTag,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetParam((wxString const &)*arg2,arg3); @@ -1226,7 +1187,7 @@ static PyObject *_wrap_HtmlTag_HasEnding(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1251,7 +1212,7 @@ static PyObject *_wrap_HtmlTag_GetBeginPos(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1276,7 +1237,7 @@ static PyObject *_wrap_HtmlTag_GetEndPos1(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1301,7 +1262,7 @@ static PyObject *_wrap_HtmlTag_GetEndPos2(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1482,12 +1443,22 @@ static PyObject *_wrap_HtmlParser_DoParsing(PyObject *self, PyObject *args, PyOb int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "begin_pos",(char *) "end_pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:HtmlParser_DoParsing",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlParser_DoParsing",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DoParsing(arg2,arg3); @@ -1749,7 +1720,7 @@ static PyObject *_wrap_HtmlWinParser_GetCharHeight(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1774,7 +1745,7 @@ static PyObject *_wrap_HtmlWinParser_GetCharWidth(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1974,7 +1945,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontSize(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1986,12 +1957,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *self, PyObject *args, wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontSize(arg2); @@ -2024,7 +2000,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontBold(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2036,12 +2012,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *self, PyObject *args, wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontBold",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontBold",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontBold(arg2); @@ -2074,7 +2055,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontItalic(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2086,12 +2067,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *self, PyObject *arg wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontItalic",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontItalic",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontItalic(arg2); @@ -2124,7 +2110,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontUnderlined(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2136,12 +2122,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *self, PyObject wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontUnderlined",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontUnderlined",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontUnderlined(arg2); @@ -2174,7 +2165,7 @@ static PyObject *_wrap_HtmlWinParser_GetFontFixed(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2186,12 +2177,17 @@ static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *self, PyObject *args wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetFontFixed",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontFixed",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFontFixed(arg2); @@ -2224,7 +2220,7 @@ static PyObject *_wrap_HtmlWinParser_GetAlign(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2236,12 +2232,17 @@ static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *self, PyObject *args, Py wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "a", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWinParser_SetAlign",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetAlign",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlign(arg2); @@ -3169,7 +3170,7 @@ static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3234,12 +3235,17 @@ static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *self, PyOb wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "s", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlRenderingState_SetSelectionState",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlRenderingState_SetSelectionState",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlRenderingState,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxHtmlSelectionState) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelectionState((wxHtmlSelectionState )arg2); @@ -3272,7 +3278,7 @@ static PyObject *_wrap_HtmlRenderingState_GetSelectionState(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3790,7 +3796,7 @@ static PyObject *_wrap_HtmlCell_GetPosX(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3815,7 +3821,7 @@ static PyObject *_wrap_HtmlCell_GetPosY(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3840,7 +3846,7 @@ static PyObject *_wrap_HtmlCell_GetWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3865,7 +3871,7 @@ static PyObject *_wrap_HtmlCell_GetHeight(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3890,7 +3896,7 @@ static PyObject *_wrap_HtmlCell_GetDescent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3978,12 +3984,26 @@ static PyObject *_wrap_HtmlCell_GetLink(PyObject *self, PyObject *args, PyObject int arg3 = (int) 0 ; wxHtmlLinkInfo *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 *)"O|ii:HtmlCell_GetLink",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:HtmlCell_GetLink",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxHtmlLinkInfo *)(arg1)->GetLink(arg2,arg3); @@ -4120,7 +4140,7 @@ static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4217,12 +4237,22 @@ static PyObject *_wrap_HtmlCell_SetPos(PyObject *self, PyObject *args, PyObject int arg2 ; int 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 *)"Oii:HtmlCell_SetPos",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlCell_SetPos",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPos(arg2,arg3); @@ -4242,12 +4272,17 @@ static PyObject *_wrap_HtmlCell_Layout(PyObject *self, PyObject *args, PyObject wxHtmlCell *arg1 = (wxHtmlCell *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlCell_Layout",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_Layout",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Layout(arg2); @@ -4273,17 +4308,37 @@ static PyObject *_wrap_HtmlCell_Draw(PyObject *self, PyObject *args, PyObject *k wxHtmlRenderingInfo *arg7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "view_y1",(char *) "view_y2",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiiiiO:HtmlCell_Draw",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:HtmlCell_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxHtmlRenderingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg7 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4311,17 +4366,27 @@ static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *self, PyObject *args, Py wxHtmlRenderingInfo *arg5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "x",(char *) "y",(char *) "info", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiiO:HtmlCell_DrawInvisible",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:HtmlCell_DrawInvisible",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxHtmlRenderingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg5 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -4347,13 +4412,18 @@ static PyObject *_wrap_HtmlCell_Find(PyObject *self, PyObject *args, PyObject *k void *arg3 = (void *) 0 ; wxHtmlCell *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "condition",(char *) "param", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:HtmlCell_Find",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlCell_Find",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4395,7 +4465,7 @@ static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -4419,7 +4489,7 @@ static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_SetCanLiveOnPagebreak",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -4454,7 +4524,7 @@ static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4479,7 +4549,7 @@ static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4494,16 +4564,26 @@ static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *self, PyObject *args, Py unsigned int arg4 = (unsigned int) wxHTML_FIND_EXACT ; wxHtmlCell *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|O:HtmlCell_FindCellByPos",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlCell_FindCellByPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { - arg4 = (unsigned int) SPyObj_AsUnsignedInt(obj3); + arg4 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -4618,7 +4698,7 @@ static PyObject *_wrap_HtmlCell_GetDepth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -4646,7 +4726,7 @@ static PyObject *_wrap_HtmlCell_IsBefore(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4802,12 +4882,17 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *self, PyObject *a wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "al", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlContainerCell_SetAlignHor",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_SetAlignHor",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignHor(arg2); @@ -4840,7 +4925,7 @@ static PyObject *_wrap_HtmlContainerCell_GetAlignHor(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4852,12 +4937,17 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *self, PyObject *a wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "al", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlContainerCell_SetAlignVer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_SetAlignVer",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignVer(arg2); @@ -4890,7 +4980,7 @@ static PyObject *_wrap_HtmlContainerCell_GetAlignVer(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4904,12 +4994,29 @@ static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *self, PyObject *arg int arg3 ; int arg4 = (int) wxHTML_UNITS_PIXELS ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i",(char *) "what",(char *) "units", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:HtmlContainerCell_SetIndent",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlContainerCell_SetIndent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetIndent(arg2,arg3,arg4); @@ -4930,12 +5037,17 @@ static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *self, PyObject *arg int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlContainerCell_GetIndent",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_GetIndent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetIndent(arg2); @@ -4943,7 +5055,7 @@ static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4956,12 +5068,17 @@ static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *self, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "ind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlContainerCell_GetIndentUnits",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_GetIndentUnits",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->GetIndentUnits(arg2); @@ -4969,7 +5086,7 @@ static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5012,12 +5129,22 @@ static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *self, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "units", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:HtmlContainerCell_SetWidthFloat",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlContainerCell_SetWidthFloat",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidthFloat(arg2,arg3); @@ -5068,12 +5195,24 @@ static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *self, PyObject * int arg2 ; int arg3 = (int) wxHTML_ALIGN_TOP ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:HtmlContainerCell_SetMinHeight",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlContainerCell_SetMinHeight",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlContainerCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinHeight(arg2,arg3); @@ -5225,13 +5364,20 @@ static PyObject *_wrap_new_HtmlColourCell(PyObject *self, PyObject *args, PyObje wxHtmlColourCell *result; wxColour *argp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "clr",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_HtmlColourCell",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_HtmlColourCell",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &argp1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; arg1 = *argp1; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxHtmlColourCell *)new wxHtmlColourCell(arg1,arg2); @@ -5291,12 +5437,19 @@ static PyObject *_wrap_new_HtmlWidgetCell(PyObject *self, PyObject *args, PyObje int arg2 = (int) 0 ; wxHtmlWidgetCell *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "wnd",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_HtmlWidgetCell",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_HtmlWidgetCell",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxHtmlWidgetCell *)new wxHtmlWidgetCell(arg1,arg2); @@ -5393,15 +5546,23 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * 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 *)"O|iOOiO:new_HtmlWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_HtmlWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -5414,6 +5575,12 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -5487,16 +5654,24 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOiO:HtmlWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:HtmlWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -5509,6 +5684,12 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -5523,7 +5704,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -5594,7 +5775,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5635,7 +5816,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5676,7 +5857,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5717,7 +5898,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5900,12 +6081,17 @@ static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *self, PyObject * wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bar", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWindow_SetRelatedStatusBar",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SetRelatedStatusBar",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRelatedStatusBar(arg2); @@ -6010,12 +6196,17 @@ static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *self, PyObject *args, PyO wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "b", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlWindow_SetBorders",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SetBorders",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorders(arg2); @@ -6122,7 +6313,7 @@ static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6147,7 +6338,7 @@ static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6172,7 +6363,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6197,7 +6388,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6304,7 +6495,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6345,7 +6536,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -6462,13 +6653,23 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *self, PyObject int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cell",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:HtmlWindow_base_OnCellMouseHover",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_base_OnCellMouseHover",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnCellMouseHover(arg2,arg3,arg4); @@ -6492,14 +6693,24 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *self, PyObject *a wxMouseEvent *arg5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cell",(char *) "x",(char *) "y",(char *) "event", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiiO:HtmlWindow_base_OnCellClicked",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:HtmlWindow_base_OnCellClicked",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxHtmlCell,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg5 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -6578,13 +6789,18 @@ static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *self, PyObject *args, PyOb int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "maxwidth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:HtmlDCRenderer_SetDC",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlDCRenderer_SetDC",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlDCRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDC(arg2,arg3); @@ -6605,12 +6821,22 @@ static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *self, PyObject *args, Py int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:HtmlDCRenderer_SetSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlDCRenderer_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlDCRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -6658,7 +6884,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6749,16 +6975,54 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO int arg8 = (int) 0 ; int result; 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 *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "to",(char *) "choices",(char *) "LCOUNT", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiiOi:HtmlDCRenderer_Render",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&obj6,&arg8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlDCRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_int,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->Render(arg2,arg3,arg4,arg5,arg6,arg7,arg8); @@ -6766,7 +7030,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6791,7 +7055,7 @@ static PyObject *_wrap_HtmlDCRenderer_GetTotalHeight(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6879,7 +7143,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args, } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -6961,17 +7225,24 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, Py bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "header",(char *) "pg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlPrintout_SetHeader",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlPrintout_SetHeader",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeader((wxString const &)*arg2,arg3); @@ -7002,17 +7273,24 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, Py bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "footer",(char *) "pg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlPrintout_SetFooter",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlPrintout_SetFooter",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFooter((wxString const &)*arg2,arg3); @@ -7089,12 +7367,47 @@ static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *self, PyObject *args, P float arg5 = (float) 25.2 ; float arg6 = (float) 5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "top",(char *) "bottom",(char *) "left",(char *) "right",(char *) "spaces", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|fffff:HtmlPrintout_SetMargins",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:HtmlPrintout_SetMargins",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (float) SWIG_PyObj_AsFloat(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (float) SWIG_PyObj_AsFloat(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (float) SWIG_PyObj_AsFloat(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (float) SWIG_PyObj_AsFloat(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (float) SWIG_PyObj_AsFloat(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3,arg4,arg5,arg6); @@ -7485,17 +7798,24 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "header",(char *) "pg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlEasyPrinting_SetHeader",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlEasyPrinting_SetHeader",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlEasyPrinting,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeader((wxString const &)*arg2,arg3); @@ -7526,17 +7846,24 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "footer",(char *) "pg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlEasyPrinting_SetFooter",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlEasyPrinting_SetFooter",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlEasyPrinting,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFooter((wxString const &)*arg2,arg3); @@ -7877,12 +8204,22 @@ static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *self, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "start",(char *) "end", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:HtmlBookRecord_SetContentsRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlBookRecord_SetContentsRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlBookRecord,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetContentsRange(arg2,arg3); @@ -7915,7 +8252,7 @@ static PyObject *_wrap_HtmlBookRecord_GetContentsStart(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7940,7 +8277,7 @@ static PyObject *_wrap_HtmlBookRecord_GetContentsEnd(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8139,7 +8476,7 @@ static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8164,7 +8501,7 @@ static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8283,7 +8620,7 @@ static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8308,7 +8645,7 @@ static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8333,7 +8670,7 @@ static PyObject *_wrap_HtmlSearchStatus_GetCurIndex(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8358,7 +8695,7 @@ static PyObject *_wrap_HtmlSearchStatus_GetMaxIndex(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8543,7 +8880,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -8611,12 +8948,17 @@ static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *self, PyObject *args, int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlHelpData_FindPageById",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpData_FindPageById",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->FindPageById(arg2); @@ -8708,7 +9050,7 @@ static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8758,7 +9100,7 @@ static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8783,14 +9125,20 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec wxHtmlHelpFrame *result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent","arg2",(char *) "title",(char *) "style",(char *) "data", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OiO:new_HtmlHelpFrame",kwnames,&obj0,&arg2,&obj2,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_HtmlHelpFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -8798,6 +9146,12 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec temp3 = True; } } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxHtmlHelpData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -8933,12 +9287,17 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *self, PyObject *args, P wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlHelpFrame_DisplayID",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpFrame_DisplayID",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Display(arg2); @@ -9027,7 +9386,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9173,11 +9532,18 @@ static PyObject *_wrap_new_HtmlHelpController(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 = (int) wxHF_DEFAULTSTYLE ; wxHtmlHelpController *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_HtmlHelpController",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_HtmlHelpController",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxHtmlHelpController *)new wxHtmlHelpController(arg1); @@ -9305,17 +9671,24 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "book",(char *) "show_wait_msg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:HtmlHelpController_AddBook",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlHelpController_AddBook",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpController,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->AddBook((wxString const &)*arg2,arg3); @@ -9323,7 +9696,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -9383,12 +9756,17 @@ static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *self, PyObject *ar wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:HtmlHelpController_DisplayID",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpController_DisplayID",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpController,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Display(arg2); @@ -9477,7 +9855,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -10854,16 +11232,17 @@ static swig_type_info _swigt__p_wxHtmlRenderingStyle[] = {{"_p_wxHtmlRenderingSt static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0},{"_p_wxMouseEvent"},{0}}; static swig_type_info _swigt__p_wxHtmlWordCell[] = {{"_p_wxHtmlWordCell", 0, "wxHtmlWordCell *", 0},{"_p_wxHtmlWordCell"},{0}}; static swig_type_info _swigt__p_wxHtmlHelpData[] = {{"_p_wxHtmlHelpData", 0, "wxHtmlHelpData *", 0},{"_p_wxHtmlHelpData"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxHtmlWinParser[] = {{"_p_wxHtmlWinParser", 0, "wxHtmlWinParser *", 0},{"_p_wxHtmlWinParser"},{0}}; static swig_type_info _swigt__p_wxHtmlParser[] = {{"_p_wxHtmlParser", 0, "wxHtmlParser *", 0},{"_p_wxHtmlParser"},{"_p_wxHtmlWinParser", _p_wxHtmlWinParserTo_p_wxHtmlParser},{0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_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_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; -static swig_type_info _swigt__p_wxHtmlFontCell[] = {{"_p_wxHtmlFontCell", 0, "wxHtmlFontCell *", 0},{"_p_wxHtmlFontCell"},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; static swig_type_info _swigt__p_wxHtmlColourCell[] = {{"_p_wxHtmlColourCell", 0, "wxHtmlColourCell *", 0},{"_p_wxHtmlColourCell"},{0}}; static swig_type_info _swigt__p_wxPyHtmlWindow[] = {{"_p_wxPyHtmlWindow", 0, "wxPyHtmlWindow *", 0},{"_p_wxPyHtmlWindow"},{0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxScrolledWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_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_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_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_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_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, "wxTopLevelWindow *", 0},{"_p_wxFrame", _p_wxFrameTo_p_wxTopLevelWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxTopLevelWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxTopLevelWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxTopLevelWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxTopLevelWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxTopLevelWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxTopLevelWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxTopLevelWindow},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxTopLevelWindow},{"_p_wxTopLevelWindow"},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxTopLevelWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxTopLevelWindow},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxTopLevelWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxTopLevelWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxTopLevelWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxTopLevelWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxTopLevelWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxTopLevelWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxTopLevelWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxTopLevelWindow},{0}}; +static swig_type_info _swigt__p_wxHtmlFontCell[] = {{"_p_wxHtmlFontCell", 0, "wxHtmlFontCell *", 0},{"_p_wxHtmlFontCell"},{0}}; static swig_type_info _swigt__p_wxHtmlEasyPrinting[] = {{"_p_wxHtmlEasyPrinting", 0, "wxHtmlEasyPrinting *", 0},{"_p_wxHtmlEasyPrinting"},{0}}; static swig_type_info _swigt__p_wxHtmlSelection[] = {{"_p_wxHtmlSelection", 0, "wxHtmlSelection *", 0},{"_p_wxHtmlSelection"},{0}}; static swig_type_info _swigt__p_wxHtmlRenderingInfo[] = {{"_p_wxHtmlRenderingInfo", 0, "wxHtmlRenderingInfo *", 0},{"_p_wxHtmlRenderingInfo"},{0}}; @@ -10907,16 +11286,17 @@ _swigt__p_wxHtmlRenderingStyle, _swigt__p_wxMouseEvent, _swigt__p_wxHtmlWordCell, _swigt__p_wxHtmlHelpData, +_swigt__p_char, _swigt__p_wxHtmlWinParser, _swigt__p_wxHtmlParser, _swigt__p_wxPanel, -_swigt__p_wxHtmlFontCell, _swigt__p_wxFont, _swigt__p_wxHtmlColourCell, _swigt__p_wxPyHtmlWindow, _swigt__p_wxScrolledWindow, _swigt__p_wxWindow, _swigt__p_wxTopLevelWindow, +_swigt__p_wxHtmlFontCell, _swigt__p_wxHtmlEasyPrinting, _swigt__p_wxHtmlSelection, _swigt__p_wxHtmlRenderingInfo, @@ -10956,60 +11336,6 @@ _swigt__p_wxHtmlBookRecord, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"HTML_ALIGN_LEFT", (long) wxHTML_ALIGN_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_ALIGN_CENTER", (long) wxHTML_ALIGN_CENTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_ALIGN_RIGHT", (long) wxHTML_ALIGN_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_ALIGN_BOTTOM", (long) wxHTML_ALIGN_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_ALIGN_TOP", (long) wxHTML_ALIGN_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_CLR_FOREGROUND", (long) wxHTML_CLR_FOREGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_CLR_BACKGROUND", (long) wxHTML_CLR_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_UNITS_PIXELS", (long) wxHTML_UNITS_PIXELS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_UNITS_PERCENT", (long) wxHTML_UNITS_PERCENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_LEFT", (long) wxHTML_INDENT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_RIGHT", (long) wxHTML_INDENT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_TOP", (long) wxHTML_INDENT_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_BOTTOM", (long) wxHTML_INDENT_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_HORIZONTAL", (long) wxHTML_INDENT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_VERTICAL", (long) wxHTML_INDENT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_INDENT_ALL", (long) wxHTML_INDENT_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_COND_ISANCHOR", (long) wxHTML_COND_ISANCHOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_COND_ISIMAGEMAP", (long) wxHTML_COND_ISIMAGEMAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_COND_USER", (long) wxHTML_COND_USER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_1", (long) wxHTML_FONT_SIZE_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_2", (long) wxHTML_FONT_SIZE_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_3", (long) wxHTML_FONT_SIZE_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_4", (long) wxHTML_FONT_SIZE_4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_5", (long) wxHTML_FONT_SIZE_5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_6", (long) wxHTML_FONT_SIZE_6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FONT_SIZE_7", (long) wxHTML_FONT_SIZE_7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HW_SCROLLBAR_NEVER", (long) wxHW_SCROLLBAR_NEVER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HW_SCROLLBAR_AUTO", (long) wxHW_SCROLLBAR_AUTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HW_NO_SELECTION", (long) wxHW_NO_SELECTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HW_DEFAULT_STYLE", (long) wxHW_DEFAULT_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_OPEN", (long) wxHTML_OPEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_BLOCK", (long) wxHTML_BLOCK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_REDIRECT", (long) wxHTML_REDIRECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_URL_PAGE", (long) wxHTML_URL_PAGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_URL_IMAGE", (long) wxHTML_URL_IMAGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_URL_OTHER", (long) wxHTML_URL_OTHER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_SEL_OUT", (long) wxHTML_SEL_OUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_SEL_IN", (long) wxHTML_SEL_IN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_SEL_CHANGING", (long) wxHTML_SEL_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FIND_EXACT", (long) wxHTML_FIND_EXACT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FIND_NEAREST_BEFORE", (long) wxHTML_FIND_NEAREST_BEFORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HTML_FIND_NEAREST_AFTER", (long) wxHTML_FIND_NEAREST_AFTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAGE_ODD", (long) wxPAGE_ODD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAGE_EVEN", (long) wxPAGE_EVEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PAGE_ALL", (long) wxPAGE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_TOOLBAR", (long) wxHF_TOOLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_FLATTOOLBAR", (long) wxHF_FLATTOOLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_CONTENTS", (long) wxHF_CONTENTS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_INDEX", (long) wxHF_INDEX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_SEARCH", (long) wxHF_SEARCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_BOOKMARKS", (long) wxHF_BOOKMARKS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_OPENFILES", (long) wxHF_OPENFILES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_PRINT", (long) wxHF_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"HF_DEFAULTSTYLE", (long) wxHF_DEFAULTSTYLE, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -11040,6 +11366,60 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"HtmlWindowNameStr",_wrap_HtmlWindowNameStr_get, _wrap_HtmlWindowNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"HtmlPrintoutTitleStr",_wrap_HtmlPrintoutTitleStr_get, _wrap_HtmlPrintoutTitleStr_set); SWIG_addvarlink(SWIG_globals,(char*)"HtmlPrintingTitleStr",_wrap_HtmlPrintingTitleStr_get, _wrap_HtmlPrintingTitleStr_set); + PyDict_SetItemString(d,"HTML_ALIGN_LEFT", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_LEFT)); + PyDict_SetItemString(d,"HTML_ALIGN_CENTER", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_CENTER)); + PyDict_SetItemString(d,"HTML_ALIGN_RIGHT", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_RIGHT)); + PyDict_SetItemString(d,"HTML_ALIGN_BOTTOM", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_BOTTOM)); + PyDict_SetItemString(d,"HTML_ALIGN_TOP", SWIG_PyObj_FromInt((int)wxHTML_ALIGN_TOP)); + PyDict_SetItemString(d,"HTML_CLR_FOREGROUND", SWIG_PyObj_FromInt((int)wxHTML_CLR_FOREGROUND)); + PyDict_SetItemString(d,"HTML_CLR_BACKGROUND", SWIG_PyObj_FromInt((int)wxHTML_CLR_BACKGROUND)); + PyDict_SetItemString(d,"HTML_UNITS_PIXELS", SWIG_PyObj_FromInt((int)wxHTML_UNITS_PIXELS)); + PyDict_SetItemString(d,"HTML_UNITS_PERCENT", SWIG_PyObj_FromInt((int)wxHTML_UNITS_PERCENT)); + PyDict_SetItemString(d,"HTML_INDENT_LEFT", SWIG_PyObj_FromInt((int)wxHTML_INDENT_LEFT)); + PyDict_SetItemString(d,"HTML_INDENT_RIGHT", SWIG_PyObj_FromInt((int)wxHTML_INDENT_RIGHT)); + PyDict_SetItemString(d,"HTML_INDENT_TOP", SWIG_PyObj_FromInt((int)wxHTML_INDENT_TOP)); + PyDict_SetItemString(d,"HTML_INDENT_BOTTOM", SWIG_PyObj_FromInt((int)wxHTML_INDENT_BOTTOM)); + PyDict_SetItemString(d,"HTML_INDENT_HORIZONTAL", SWIG_PyObj_FromInt((int)wxHTML_INDENT_HORIZONTAL)); + PyDict_SetItemString(d,"HTML_INDENT_VERTICAL", SWIG_PyObj_FromInt((int)wxHTML_INDENT_VERTICAL)); + PyDict_SetItemString(d,"HTML_INDENT_ALL", SWIG_PyObj_FromInt((int)wxHTML_INDENT_ALL)); + PyDict_SetItemString(d,"HTML_COND_ISANCHOR", SWIG_PyObj_FromInt((int)wxHTML_COND_ISANCHOR)); + PyDict_SetItemString(d,"HTML_COND_ISIMAGEMAP", SWIG_PyObj_FromInt((int)wxHTML_COND_ISIMAGEMAP)); + PyDict_SetItemString(d,"HTML_COND_USER", SWIG_PyObj_FromInt((int)wxHTML_COND_USER)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_1", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_1)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_2", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_2)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_3", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_3)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_4", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_4)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_5", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_5)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_6", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_6)); + PyDict_SetItemString(d,"HTML_FONT_SIZE_7", SWIG_PyObj_FromInt((int)wxHTML_FONT_SIZE_7)); + PyDict_SetItemString(d,"HW_SCROLLBAR_NEVER", SWIG_PyObj_FromInt((int)wxHW_SCROLLBAR_NEVER)); + PyDict_SetItemString(d,"HW_SCROLLBAR_AUTO", SWIG_PyObj_FromInt((int)wxHW_SCROLLBAR_AUTO)); + PyDict_SetItemString(d,"HW_NO_SELECTION", SWIG_PyObj_FromInt((int)wxHW_NO_SELECTION)); + PyDict_SetItemString(d,"HW_DEFAULT_STYLE", SWIG_PyObj_FromInt((int)wxHW_DEFAULT_STYLE)); + PyDict_SetItemString(d,"HTML_OPEN", SWIG_PyObj_FromInt((int)wxHTML_OPEN)); + PyDict_SetItemString(d,"HTML_BLOCK", SWIG_PyObj_FromInt((int)wxHTML_BLOCK)); + PyDict_SetItemString(d,"HTML_REDIRECT", SWIG_PyObj_FromInt((int)wxHTML_REDIRECT)); + PyDict_SetItemString(d,"HTML_URL_PAGE", SWIG_PyObj_FromInt((int)wxHTML_URL_PAGE)); + PyDict_SetItemString(d,"HTML_URL_IMAGE", SWIG_PyObj_FromInt((int)wxHTML_URL_IMAGE)); + PyDict_SetItemString(d,"HTML_URL_OTHER", SWIG_PyObj_FromInt((int)wxHTML_URL_OTHER)); + PyDict_SetItemString(d,"HTML_SEL_OUT", SWIG_PyObj_FromInt((int)wxHTML_SEL_OUT)); + PyDict_SetItemString(d,"HTML_SEL_IN", SWIG_PyObj_FromInt((int)wxHTML_SEL_IN)); + PyDict_SetItemString(d,"HTML_SEL_CHANGING", SWIG_PyObj_FromInt((int)wxHTML_SEL_CHANGING)); + PyDict_SetItemString(d,"HTML_FIND_EXACT", SWIG_PyObj_FromInt((int)wxHTML_FIND_EXACT)); + PyDict_SetItemString(d,"HTML_FIND_NEAREST_BEFORE", SWIG_PyObj_FromInt((int)wxHTML_FIND_NEAREST_BEFORE)); + PyDict_SetItemString(d,"HTML_FIND_NEAREST_AFTER", SWIG_PyObj_FromInt((int)wxHTML_FIND_NEAREST_AFTER)); + PyDict_SetItemString(d,"PAGE_ODD", SWIG_PyObj_FromInt((int)wxPAGE_ODD)); + PyDict_SetItemString(d,"PAGE_EVEN", SWIG_PyObj_FromInt((int)wxPAGE_EVEN)); + PyDict_SetItemString(d,"PAGE_ALL", SWIG_PyObj_FromInt((int)wxPAGE_ALL)); + PyDict_SetItemString(d,"HF_TOOLBAR", SWIG_PyObj_FromInt((int)wxHF_TOOLBAR)); + PyDict_SetItemString(d,"HF_FLATTOOLBAR", SWIG_PyObj_FromInt((int)wxHF_FLATTOOLBAR)); + PyDict_SetItemString(d,"HF_CONTENTS", SWIG_PyObj_FromInt((int)wxHF_CONTENTS)); + PyDict_SetItemString(d,"HF_INDEX", SWIG_PyObj_FromInt((int)wxHF_INDEX)); + PyDict_SetItemString(d,"HF_SEARCH", SWIG_PyObj_FromInt((int)wxHF_SEARCH)); + PyDict_SetItemString(d,"HF_BOOKMARKS", SWIG_PyObj_FromInt((int)wxHF_BOOKMARKS)); + PyDict_SetItemString(d,"HF_OPENFILES", SWIG_PyObj_FromInt((int)wxHF_OPENFILES)); + PyDict_SetItemString(d,"HF_PRINT", SWIG_PyObj_FromInt((int)wxHF_PRINT)); + PyDict_SetItemString(d,"HF_DEFAULTSTYLE", SWIG_PyObj_FromInt((int)wxHF_DEFAULTSTYLE)); wxPyPtrTypeMap_Add("wxHtmlTagHandler", "wxPyHtmlTagHandler"); wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler"); diff --git a/wxPython/src/msw/misc.py b/wxPython/src/msw/misc.py index e08d0359e0..98ef175946 100644 --- a/wxPython/src/msw/misc.py +++ b/wxPython/src/msw/misc.py @@ -1769,7 +1769,7 @@ class Joystick(object): return _misc.Joystick_SetMovementThreshold(*args, **kwargs) def IsOk(*args, **kwargs): - """IsOk(void ??) -> bool""" + """IsOk() -> bool""" return _misc.Joystick_IsOk(*args, **kwargs) def GetNumberJoysticks(*args, **kwargs): diff --git a/wxPython/src/msw/misc_wrap.cpp b/wxPython/src/msw/misc_wrap.cpp index 4df2e639c1..7366d48059 100644 --- a/wxPython/src/msw/misc_wrap.cpp +++ b/wxPython/src/msw/misc_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -408,12 +257,12 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxLogTextCtrl swig_types[24] #define SWIGTYPE_p_wxTextCtrl swig_types[25] #define SWIGTYPE_p_wxBusyCursor swig_types[26] -#define SWIGTYPE_p_wxFileDataObject swig_types[27] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[28] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[29] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[30] -#define SWIGTYPE_p_wxTextDataObject swig_types[31] -#define SWIGTYPE_p_wxDataObject swig_types[32] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[27] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[28] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[29] +#define SWIGTYPE_p_wxTextDataObject swig_types[30] +#define SWIGTYPE_p_wxDataObject swig_types[31] +#define SWIGTYPE_p_wxFileDataObject swig_types[32] #define SWIGTYPE_p_wxCustomDataObject swig_types[33] #define SWIGTYPE_p_wxURLDataObject swig_types[34] #define SWIGTYPE_p_wxMetafileDataObject swig_types[35] @@ -430,41 +279,42 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxDataObjectSimple swig_types[46] #define SWIGTYPE_p_wxEvtHandler swig_types[47] #define SWIGTYPE_p_wxRect swig_types[48] -#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[49] -#define SWIGTYPE_p_wxFileTypeInfo swig_types[50] -#define SWIGTYPE_p_wxFrame swig_types[51] -#define SWIGTYPE_p_wxTimer swig_types[52] -#define SWIGTYPE_p_wxMimeTypesManager swig_types[53] -#define SWIGTYPE_p_wxPyArtProvider swig_types[54] -#define SWIGTYPE_p_wxPyTipProvider swig_types[55] -#define SWIGTYPE_p_wxTipProvider swig_types[56] -#define SWIGTYPE_p_wxJoystick swig_types[57] -#define SWIGTYPE_p_wxSystemOptions swig_types[58] -#define SWIGTYPE_p_wxPoint swig_types[59] -#define SWIGTYPE_p_wxJoystickEvent swig_types[60] -#define SWIGTYPE_p_wxCursor swig_types[61] -#define SWIGTYPE_p_wxObject swig_types[62] -#define SWIGTYPE_p_wxOutputStream swig_types[63] -#define SWIGTYPE_p_wxDateTime swig_types[64] -#define SWIGTYPE_p_wxPyDropSource swig_types[65] -#define SWIGTYPE_p_wxWindow swig_types[66] -#define SWIGTYPE_p_wxString swig_types[67] -#define SWIGTYPE_p_wxPyProcess swig_types[68] -#define SWIGTYPE_p_wxBitmap swig_types[69] -#define SWIGTYPE_p_wxConfig swig_types[70] -#define SWIGTYPE_p_wxChar swig_types[71] -#define SWIGTYPE_p_wxBusyInfo swig_types[72] -#define SWIGTYPE_p_wxPyDropTarget swig_types[73] -#define SWIGTYPE_p_wxPyTextDropTarget swig_types[74] -#define SWIGTYPE_p_wxPyFileDropTarget swig_types[75] -#define SWIGTYPE_p_wxProcessEvent swig_types[76] -#define SWIGTYPE_p_wxPyLog swig_types[77] -#define SWIGTYPE_p_wxLogNull swig_types[78] -#define SWIGTYPE_p_wxColour swig_types[79] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[80] -#define SWIGTYPE_p_wxPyTimer swig_types[81] -#define SWIGTYPE_p_wxDateSpan swig_types[82] -static swig_type_info *swig_types[84]; +#define SWIGTYPE_p_char swig_types[49] +#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[50] +#define SWIGTYPE_p_wxFileTypeInfo swig_types[51] +#define SWIGTYPE_p_wxFrame swig_types[52] +#define SWIGTYPE_p_wxTimer swig_types[53] +#define SWIGTYPE_p_wxMimeTypesManager swig_types[54] +#define SWIGTYPE_p_wxPyArtProvider swig_types[55] +#define SWIGTYPE_p_wxPyTipProvider swig_types[56] +#define SWIGTYPE_p_wxTipProvider swig_types[57] +#define SWIGTYPE_p_wxJoystick swig_types[58] +#define SWIGTYPE_p_wxSystemOptions swig_types[59] +#define SWIGTYPE_p_wxPoint swig_types[60] +#define SWIGTYPE_p_wxJoystickEvent swig_types[61] +#define SWIGTYPE_p_wxCursor swig_types[62] +#define SWIGTYPE_p_wxObject swig_types[63] +#define SWIGTYPE_p_wxOutputStream swig_types[64] +#define SWIGTYPE_p_wxDateTime swig_types[65] +#define SWIGTYPE_p_wxPyDropSource swig_types[66] +#define SWIGTYPE_p_wxWindow swig_types[67] +#define SWIGTYPE_p_wxString swig_types[68] +#define SWIGTYPE_p_wxPyProcess swig_types[69] +#define SWIGTYPE_p_wxBitmap swig_types[70] +#define SWIGTYPE_p_wxConfig swig_types[71] +#define SWIGTYPE_p_wxChar swig_types[72] +#define SWIGTYPE_p_wxBusyInfo swig_types[73] +#define SWIGTYPE_p_wxPyDropTarget swig_types[74] +#define SWIGTYPE_p_wxPyTextDropTarget swig_types[75] +#define SWIGTYPE_p_wxPyFileDropTarget swig_types[76] +#define SWIGTYPE_p_wxProcessEvent swig_types[77] +#define SWIGTYPE_p_wxPyLog swig_types[78] +#define SWIGTYPE_p_wxLogNull swig_types[79] +#define SWIGTYPE_p_wxColour swig_types[80] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[81] +#define SWIGTYPE_p_wxPyTimer swig_types[82] +#define SWIGTYPE_p_wxDateSpan swig_types[83] +static swig_type_info *swig_types[85]; /* -------- TYPES TABLE (END) -------- */ @@ -476,6 +326,44 @@ static swig_type_info *swig_types[84]; #define SWIG_name "_misc" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/pyistream.h" @@ -484,10 +372,41 @@ static swig_type_info *swig_types[84]; static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -515,6 +434,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + bool wxThread_IsMain() { #ifdef WXP_WITH_THREAD return wxThread::IsMain(); @@ -637,6 +564,14 @@ IMP_PYCALLBACK_STRING_STRING(wxPyTipProvider, wxTipProvider, PreprocessTip); IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify); + +SWIGSTATIC(unsigned int) +SWIG_PyObj_AsUnsignedInt(PyObject *obj) +{ + return numeric_cast(unsigned int, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned int", UINT_MAX)); +} + wxString Log_TimeStamp(){ wxString msg; wxLog::TimeStamp(&msg); @@ -998,6 +933,22 @@ long wxConfigBase_ReadInt(wxConfigBase *self,wxString const &key,long defaultVal self->Read(key, &rv, defaultVal); return rv; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + double wxConfigBase_ReadFloat(wxConfigBase *self,wxString const &key,double defaultVal){ double rv; self->Read(key, &rv, defaultVal); @@ -1017,6 +968,9 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa #define LOCAL_TZ wxDateTime::Local + +#define SWIG_PyObj_FromUnsignedInt SWIG_PyObj_FromUnsignedLong + wxDateTime wxDateTime___add____SWIG_0(wxDateTime *self,wxTimeSpan const &other){ return *self + other; } wxDateTime wxDateTime___add____SWIG_1(wxDateTime *self,wxDateSpan const &other){ return *self + other; } wxTimeSpan wxDateTime___sub____SWIG_0(wxDateTime *self,wxDateTime const &other){ return *self - other; } @@ -1295,11 +1249,16 @@ static PyObject *_wrap_SystemSettings_GetColour(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 ; wxColour result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_GetColour",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetColour",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemColour) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxSystemSettings::GetColour((wxSystemColour )arg1); @@ -1322,11 +1281,16 @@ static PyObject *_wrap_SystemSettings_GetFont(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 ; wxFont result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_GetFont",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetFont",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemFont) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxSystemSettings::GetFont((wxSystemFont )arg1); @@ -1349,11 +1313,16 @@ static PyObject *_wrap_SystemSettings_GetMetric(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_GetMetric",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetMetric",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemMetric) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxSystemSettings::GetMetric((wxSystemMetric )arg1); @@ -1361,7 +1330,7 @@ static PyObject *_wrap_SystemSettings_GetMetric(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1372,11 +1341,16 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_HasFeature",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_HasFeature",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemFeature) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxSystemSettings::HasFeature((wxSystemFeature )arg1); @@ -1384,7 +1358,7 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1406,7 +1380,7 @@ static PyObject *_wrap_SystemSettings_GetScreenType(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1416,11 +1390,16 @@ static PyObject *_wrap_SystemSettings_GetScreenType(PyObject *self, PyObject *ar static PyObject *_wrap_SystemSettings_SetScreenType(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "screen", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:SystemSettings_SetScreenType",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_SetScreenType",kwnames,&obj0)) goto fail; + { + arg1 = (wxSystemScreenType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSystemSettings::SetScreenType((wxSystemScreenType )arg1); @@ -1523,16 +1502,21 @@ static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args int arg2 ; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "name",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SystemOptions_SetOptionInt",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SystemOptions_SetOptionInt",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSystemOptions::SetOption((wxString const &)*arg1,arg2); @@ -1622,7 +1606,7 @@ static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp1) delete arg1; @@ -1660,7 +1644,7 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -1682,7 +1666,7 @@ static PyObject * SystemOptions_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_FileSelectorPromptStr_set(PyObject *_val) { +static int _wrap_FileSelectorPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only."); return 1; } @@ -1702,7 +1686,7 @@ static PyObject *_wrap_FileSelectorPromptStr_get() { } -static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) { +static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only."); return 1; } @@ -1722,7 +1706,7 @@ static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() { } -static int _wrap_DirSelectorPromptStr_set(PyObject *_val) { +static int _wrap_DirSelectorPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only."); return 1; } @@ -1757,7 +1741,7 @@ static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -1767,11 +1751,16 @@ static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:RegisterId",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegisterId",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxRegisterId(arg1); @@ -1801,7 +1790,7 @@ static PyObject *_wrap_GetCurrentId(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -1862,7 +1851,7 @@ static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:GetElapsedTime",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -1873,7 +1862,7 @@ static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -1930,7 +1919,7 @@ static PyObject *_wrap_IsBusy(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1991,7 +1980,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -2048,7 +2037,7 @@ static PyObject *_wrap_GetOsVersion(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { PyObject *o = PyInt_FromLong((long) (*arg1)); resultobj = t_output_helper(resultobj,o); @@ -2106,7 +2095,7 @@ static PyObject *_wrap_GetFreeMemory(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -2117,11 +2106,16 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "wFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Shutdown",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Shutdown",kwnames,&obj0)) goto fail; + { + arg1 = (wxShutdownFlags) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxShutdown((wxShutdownFlags )arg1); @@ -2129,7 +2123,7 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2139,11 +2133,16 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs static PyObject *_wrap_Sleep(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "secs", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Sleep",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sleep",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSleep(arg1); @@ -2168,7 +2167,7 @@ static PyObject *_wrap_Usleep(PyObject *self, PyObject *args, PyObject *kwargs) if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Usleep",kwnames,&obj0)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -2195,7 +2194,7 @@ static PyObject *_wrap_EnableTopLevelWindows(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EnableTopLevelWindows",kwnames,&obj0)) goto fail; { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -2486,7 +2485,7 @@ static PyObject *_wrap_GetProcessId(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -2541,12 +2540,15 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "message",(char *) "default_path",(char *) "default_filename",(char *) "default_extension",(char *) "wildcard",(char *) "flags",(char *) "parent",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOiOii:FileSelector",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&arg8,&arg9)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOOOOO:FileSelector",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -2582,9 +2584,27 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw temp5 = True; } } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxFileSelector((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9); @@ -2829,13 +2849,14 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa wxPoint temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "message",(char *) "defaultPath",(char *) "style",(char *) "pos",(char *) "parent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOlOO:DirSelector",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:DirSelector",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -2850,6 +2871,12 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa temp2 = True; } } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -2914,12 +2941,14 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "message",(char *) "caption",(char *) "default_value",(char *) "parent",(char *) "x",(char *) "y",(char *) "centre", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOiiO:GetTextFromUser",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:GetTextFromUser",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -2942,9 +2971,21 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg7 = (bool) SPyObj_AsBool(obj6); + arg7 = (bool) SWIG_PyObj_AsBool(obj6); if (PyErr_Occurred()) SWIG_fail; } } @@ -3098,12 +3139,16 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "message",(char *) "caption",(char *) "choices",(char *) "parent",(char *) "x",(char *) "y",(char *) "centre",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OiiOii:GetSingleChoice",kwnames,&obj0,&obj1,&obj2,&obj3,&arg6,&arg7,&obj6,&arg9,&arg10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:GetSingleChoice",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3122,9 +3167,33 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg8 = (bool) SPyObj_AsBool(obj6); + arg8 = (bool) SWIG_PyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg10 = (int) SWIG_PyObj_AsInt(obj8); if (PyErr_Occurred()) SWIG_fail; } } @@ -3189,12 +3258,16 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char *kwnames[] = { (char *) "message",(char *) "caption",(char *) "choices",(char *) "parent",(char *) "x",(char *) "y",(char *) "centre",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OiiOii:GetSingleChoiceIndex",kwnames,&obj0,&obj1,&obj2,&obj3,&arg6,&arg7,&obj6,&arg9,&arg10)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOO:GetSingleChoiceIndex",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3213,9 +3286,33 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { - arg8 = (bool) SPyObj_AsBool(obj6); + arg8 = (bool) SWIG_PyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg10 = (int) SWIG_PyObj_AsInt(obj8); if (PyErr_Occurred()) SWIG_fail; } } @@ -3226,7 +3323,7 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp1) delete arg1; @@ -3269,12 +3366,15 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "message",(char *) "caption",(char *) "style",(char *) "parent",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OiOii:MessageBox",kwnames,&obj0,&obj1,&arg3,&obj3,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:MessageBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3287,9 +3387,27 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar temp2 = True; } } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxMessageBox((wxString const &)*arg1,(wxString const &)*arg2,arg3,arg4,arg5,arg6); @@ -3297,7 +3415,7 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp1) delete arg1; @@ -3339,13 +3457,16 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj6 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "message",(char *) "prompt",(char *) "caption",(char *) "value",(char *) "min",(char *) "max",(char *) "parent",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOl|llOO:GetNumberFromUser",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:GetNumberFromUser",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3361,6 +3482,22 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec if (arg3 == NULL) SWIG_fail; temp3 = True; } + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -3377,7 +3514,7 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp1) delete arg1; @@ -3423,7 +3560,7 @@ static PyObject *_wrap_ColourDisplay(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3445,7 +3582,7 @@ static PyObject *_wrap_DisplayDepth(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3467,7 +3604,7 @@ static PyObject *_wrap_GetDisplayDepth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3841,11 +3978,16 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "key", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetKeyState",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetKeyState",kwnames,&obj0)) goto fail; + { + arg1 = (wxKeyCode) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxGetKeyState((wxKeyCode )arg1); @@ -3853,7 +3995,7 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3991,7 +4133,7 @@ static PyObject *_wrap_Thread_IsMain(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4146,7 +4288,7 @@ static PyObject *_wrap_ToolTip_Enable(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ToolTip_Enable",kwnames,&obj0)) goto fail; { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -4166,11 +4308,16 @@ static PyObject *_wrap_ToolTip_Enable(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_ToolTip_SetDelay(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "milliseconds", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:ToolTip_SetDelay",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ToolTip_SetDelay",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxToolTip::SetDelay(arg1); @@ -4266,7 +4413,7 @@ static PyObject *_wrap_Caret_IsOk(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4291,7 +4438,7 @@ static PyObject *_wrap_Caret_IsVisible(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -4465,12 +4612,22 @@ static PyObject *_wrap_Caret_MoveXY(PyObject *self, PyObject *args, PyObject *kw int arg2 ; int 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 *)"Oii:Caret_MoveXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Caret_MoveXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Move(arg2,arg3); @@ -4522,12 +4679,22 @@ static PyObject *_wrap_Caret_SetSizeWH(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Caret_SetSizeWH",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Caret_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSize(arg2,arg3); @@ -4578,12 +4745,19 @@ static PyObject *_wrap_Caret_Show(PyObject *self, PyObject *args, PyObject *kwar wxCaret *arg1 = (wxCaret *) 0 ; int arg2 = (int) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "show", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Caret_Show",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Caret_Show",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Show(arg2); @@ -4644,7 +4818,7 @@ static PyObject *_wrap_Caret_GetBlinkTime(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4654,11 +4828,16 @@ static PyObject *_wrap_Caret_GetBlinkTime(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Caret_SetBlinkTime(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "milliseconds", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Caret_SetBlinkTime",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_SetBlinkTime",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxCaret_SetBlinkTime(arg1); @@ -4885,12 +5064,19 @@ static PyObject *_wrap_StopWatch_Start(PyObject *self, PyObject *args, PyObject wxStopWatch *arg1 = (wxStopWatch *) 0 ; long arg2 = (long) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "t0", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:StopWatch_Start",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StopWatch_Start",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStopWatch,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Start(arg2); @@ -4971,7 +5157,7 @@ static PyObject *_wrap_StopWatch_Time(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4989,11 +5175,18 @@ static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 = (int) 9 ; wxFileHistory *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "maxFiles", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_FileHistory",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FileHistory",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFileHistory *)new wxFileHistory(arg1); @@ -5077,12 +5270,17 @@ static PyObject *_wrap_FileHistory_RemoveFileFromHistory(PyObject *self, PyObjec wxFileHistory *arg1 = (wxFileHistory *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FileHistory_RemoveFileFromHistory",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileHistory_RemoveFileFromHistory",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileHistory,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RemoveFileFromHistory(arg2); @@ -5115,7 +5313,7 @@ static PyObject *_wrap_FileHistory_GetMaxFiles(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5293,12 +5491,17 @@ static PyObject *_wrap_FileHistory_GetHistoryFile(PyObject *self, PyObject *args int arg2 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FileHistory_GetHistoryFile",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileHistory_GetHistoryFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileHistory,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxFileHistory const *)arg1)->GetHistoryFile(arg2); @@ -5337,7 +5540,7 @@ static PyObject *_wrap_FileHistory_GetCount(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5491,7 +5694,7 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -5532,7 +5735,7 @@ static PyObject *_wrap_SingleInstanceChecker_IsAnotherRunning(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5553,16 +5756,21 @@ static PyObject *_wrap_DrawWindowOnDC(PyObject *self, PyObject *args, PyObject * int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "window",(char *) "dc",(char *) "method", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:DrawWindowOnDC",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DrawWindowOnDC",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxDrawWindowOnDC(arg1,(wxDC const &)*arg2,arg3); @@ -5650,7 +5858,7 @@ static PyObject *_wrap_TipProvider_GetCurrentTip(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -5722,7 +5930,7 @@ static PyObject *_wrap_new_PyTipProvider(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PyTipProvider",kwnames,&obj0)) goto fail; { - arg1 = (size_t) SPyObj_AsUnsignedLong(obj0); + arg1 = (size_t) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -5794,7 +6002,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTipProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5805,7 +6013,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5831,7 +6039,7 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO temp1 = True; } { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -5862,14 +6070,21 @@ static PyObject *_wrap_new_Timer(PyObject *self, PyObject *args, PyObject *kwarg int arg2 = (int) -1 ; wxPyTimer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "owner",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_Timer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Timer",kwnames,&obj0,&obj1)) goto fail; if (obj0) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyTimer *)new wxPyTimer(arg1,arg2); @@ -5945,13 +6160,20 @@ static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject * int arg3 = (int) -1 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "owner",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Timer_SetOwner",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Timer_SetOwner",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOwner(arg2,arg3); @@ -5973,16 +6195,23 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa bool arg3 = (bool) False ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "milliseconds",(char *) "oneShot", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Timer_Start",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Timer_Start",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5993,7 +6222,7 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6042,7 +6271,7 @@ static PyObject *_wrap_Timer_IsRunning(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6067,7 +6296,7 @@ static PyObject *_wrap_Timer_GetInterval(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6092,7 +6321,7 @@ static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6117,7 +6346,7 @@ static PyObject *_wrap_Timer_GetId(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6136,11 +6365,25 @@ static PyObject *_wrap_new_TimerEvent(PyObject *self, PyObject *args, PyObject * int arg1 = (int) 0 ; int arg2 = (int) 0 ; wxTimerEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "timerid",(char *) "interval", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_TimerEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TimerEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTimerEvent *)new wxTimerEvent(arg1,arg2); @@ -6173,7 +6416,7 @@ static PyObject *_wrap_TimerEvent_GetInterval(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6219,16 +6462,21 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *self, PyObject *args) { bool arg3 = (bool) False ; wxTimerRunner *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi|O:new_TimerRunner",&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_TimerRunner",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6283,7 +6531,7 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -6296,7 +6544,7 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { return _wrap_new_TimerRunner__SWIG_1(self,args); } { - SPyObj_AsBool(argv[2]); + SWIG_PyObj_AsBool(argv[2]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -6346,16 +6594,21 @@ static PyObject *_wrap_TimerRunner_Start(PyObject *self, PyObject *args, PyObjec int arg2 ; bool arg3 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "milli",(char *) "oneShot", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:TimerRunner_Start",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TimerRunner_Start",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimerRunner,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -6417,7 +6670,7 @@ static PyObject *_wrap_Log_IsEnabled(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6436,7 +6689,7 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Log_EnableLogging",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -6447,7 +6700,7 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6468,12 +6721,12 @@ static PyObject *_wrap_Log_OnLog(PyObject *self, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Log_OnLog",kwnames,&obj0,&obj1,&obj2)) goto fail; { - arg1 = (wxLogLevel) SPyObj_AsUnsignedLong(obj0); + arg1 = (wxLogLevel) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxChar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (time_t) SPyObj_AsUnsignedInt(obj2); + arg3 = (time_t) SWIG_PyObj_AsUnsignedInt(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6635,7 +6888,7 @@ static PyObject *_wrap_Log_SetVerbose(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Log_SetVerbose",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -6663,7 +6916,7 @@ static PyObject *_wrap_Log_SetLogLevel(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetLogLevel",kwnames,&obj0)) goto fail; { - arg1 = (wxLogLevel) SPyObj_AsUnsignedLong(obj0); + arg1 = (wxLogLevel) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -6711,7 +6964,7 @@ static PyObject *_wrap_Log_SetTraceMask(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetTraceMask",kwnames,&obj0)) goto fail; { - arg1 = (wxTraceMask) SPyObj_AsUnsignedLong(obj0); + arg1 = (wxTraceMask) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -6889,7 +7142,7 @@ static PyObject *_wrap_Log_GetVerbose(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6911,7 +7164,7 @@ static PyObject *_wrap_Log_GetTraceMask(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -6936,7 +7189,7 @@ static PyObject *_wrap_Log_IsAllowedTraceMask(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6958,7 +7211,7 @@ static PyObject *_wrap_Log_GetLogLevel(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -7161,13 +7414,13 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -7207,7 +7460,7 @@ static PyObject *_wrap_LogWindow_Show(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -7295,7 +7548,7 @@ static PyObject *_wrap_LogWindow_IsPassingMessages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7315,7 +7568,7 @@ static PyObject *_wrap_LogWindow_PassMessages(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogWindow_PassMessages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -7404,7 +7657,7 @@ static PyObject *_wrap_LogChain_PassMessages(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogChain_PassMessages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogChain,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -7439,7 +7692,7 @@ static PyObject *_wrap_LogChain_IsPassingMessages(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7493,7 +7746,7 @@ static PyObject *_wrap_SysErrorCode(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -7512,7 +7765,7 @@ static PyObject *_wrap_SysErrorMsg(PyObject *self, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:SysErrorMsg",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -7919,7 +8172,7 @@ static PyObject *_wrap_LogTrace__SWIG_0(PyObject *self, PyObject *args) { if(!PyArg_ParseTuple(args,(char *)"OO:LogTrace",&obj0,&obj1)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -8037,7 +8290,7 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) { if (argc == 2) { int _v; { - SPyObj_AsUnsignedLong(argv[0]); + SWIG_PyObj_AsUnsignedLong(argv[0]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -8079,7 +8332,7 @@ static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail; { - arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -8279,11 +8532,23 @@ static PyObject *_wrap_Process_Kill(PyObject *self, PyObject *args, PyObject *kw int arg1 ; int arg2 = (int) wxSIGTERM ; int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "pid",(char *) "sig", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:Process_Kill",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Process_Kill",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxSignal) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxPyProcess::Kill(arg1,(wxSignal )arg2); @@ -8291,7 +8556,7 @@ static PyObject *_wrap_Process_Kill(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8302,11 +8567,16 @@ static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "pid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Process_Exists",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Process_Exists",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxPyProcess::Exists(arg1); @@ -8314,7 +8584,7 @@ static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8328,16 +8598,23 @@ static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kw wxPyProcess *result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "cmd",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Process_Open",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Process_Open",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyProcess *)wxPyProcess::Open((wxString const &)*arg1,arg2); @@ -8366,14 +8643,21 @@ static PyObject *_wrap_new_Process(PyObject *self, PyObject *args, PyObject *kwa int arg2 = (int) -1 ; wxPyProcess *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_Process",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Process",kwnames,&obj0,&obj1)) goto fail; if (obj0) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyProcess *)new wxPyProcess(arg1,arg2); @@ -8424,12 +8708,22 @@ static PyObject *_wrap_Process_base_OnTerminate(PyObject *self, PyObject *args, int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pid",(char *) "status", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Process_base_OnTerminate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Process_base_OnTerminate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyProcess,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_OnTerminate(arg2,arg3); @@ -8486,7 +8780,7 @@ static PyObject *_wrap_Process_IsRedirected(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8648,7 +8942,7 @@ static PyObject *_wrap_Process_IsInputOpened(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8673,7 +8967,7 @@ static PyObject *_wrap_Process_IsInputAvailable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8698,7 +8992,7 @@ static PyObject *_wrap_Process_IsErrorAvailable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8718,11 +9012,32 @@ static PyObject *_wrap_new_ProcessEvent(PyObject *self, PyObject *args, PyObject int arg2 = (int) 0 ; int arg3 = (int) 0 ; wxProcessEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "id",(char *) "pid",(char *) "exitcode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iii:new_ProcessEvent",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ProcessEvent",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxProcessEvent *)new wxProcessEvent(arg1,arg2,arg3); @@ -8755,7 +9070,7 @@ static PyObject *_wrap_ProcessEvent_GetPid(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8780,7 +9095,7 @@ static PyObject *_wrap_ProcessEvent_GetExitCode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8792,12 +9107,17 @@ static PyObject *_wrap_ProcessEvent_m_pid_set(PyObject *self, PyObject *args, Py wxProcessEvent *arg1 = (wxProcessEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_pid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ProcessEvent_m_pid_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ProcessEvent_m_pid_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProcessEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_pid = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -8820,7 +9140,7 @@ static PyObject *_wrap_ProcessEvent_m_pid_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProcessEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_pid); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8832,12 +9152,17 @@ static PyObject *_wrap_ProcessEvent_m_exitcode_set(PyObject *self, PyObject *arg wxProcessEvent *arg1 = (wxProcessEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_exitcode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ProcessEvent_m_exitcode_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ProcessEvent_m_exitcode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProcessEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_exitcode = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -8860,7 +9185,7 @@ static PyObject *_wrap_ProcessEvent_m_exitcode_get(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProcessEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_exitcode); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8882,17 +9207,24 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs) long result; bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "command",(char *) "flags",(char *) "process", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Execute",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Execute",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; temp1 = True; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyProcess,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -8903,7 +9235,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp1) delete arg1; @@ -8922,11 +9254,18 @@ static PyObject *_wrap_new_Joystick(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; int arg1 = (int) wxJOYSTICK1 ; wxJoystick *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "joystick", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_Joystick",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Joystick",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxJoystick *)new wxJoystick(arg1); @@ -9012,7 +9351,7 @@ static PyObject *_wrap_Joystick_GetZPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9037,7 +9376,7 @@ static PyObject *_wrap_Joystick_GetButtonState(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9062,7 +9401,7 @@ static PyObject *_wrap_Joystick_GetPOVPosition(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9087,7 +9426,7 @@ static PyObject *_wrap_Joystick_GetPOVCTSPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9112,7 +9451,7 @@ static PyObject *_wrap_Joystick_GetRudderPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9137,7 +9476,7 @@ static PyObject *_wrap_Joystick_GetUPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9162,7 +9501,7 @@ static PyObject *_wrap_Joystick_GetVPosition(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9187,7 +9526,7 @@ static PyObject *_wrap_Joystick_GetMovementThreshold(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9199,12 +9538,17 @@ static PyObject *_wrap_Joystick_SetMovementThreshold(PyObject *self, PyObject *a wxJoystick *arg1 = (wxJoystick *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "threshold", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Joystick_SetMovementThreshold",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Joystick_SetMovementThreshold",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystick,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMovementThreshold(arg2); @@ -9237,7 +9581,7 @@ static PyObject *_wrap_Joystick_IsOk(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9262,7 +9606,7 @@ static PyObject *_wrap_Joystick_GetNumberJoysticks(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9287,7 +9631,7 @@ static PyObject *_wrap_Joystick_GetManufacturerId(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9312,7 +9656,7 @@ static PyObject *_wrap_Joystick_GetProductId(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9368,7 +9712,7 @@ static PyObject *_wrap_Joystick_GetXMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9393,7 +9737,7 @@ static PyObject *_wrap_Joystick_GetYMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9418,7 +9762,7 @@ static PyObject *_wrap_Joystick_GetZMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9443,7 +9787,7 @@ static PyObject *_wrap_Joystick_GetXMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9468,7 +9812,7 @@ static PyObject *_wrap_Joystick_GetYMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9493,7 +9837,7 @@ static PyObject *_wrap_Joystick_GetZMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9518,7 +9862,7 @@ static PyObject *_wrap_Joystick_GetNumberButtons(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9543,7 +9887,7 @@ static PyObject *_wrap_Joystick_GetNumberAxes(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9568,7 +9912,7 @@ static PyObject *_wrap_Joystick_GetMaxButtons(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9593,7 +9937,7 @@ static PyObject *_wrap_Joystick_GetMaxAxes(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9618,7 +9962,7 @@ static PyObject *_wrap_Joystick_GetPollingMin(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9643,7 +9987,7 @@ static PyObject *_wrap_Joystick_GetPollingMax(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9668,7 +10012,7 @@ static PyObject *_wrap_Joystick_GetRudderMin(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9693,7 +10037,7 @@ static PyObject *_wrap_Joystick_GetRudderMax(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9718,7 +10062,7 @@ static PyObject *_wrap_Joystick_GetUMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9743,7 +10087,7 @@ static PyObject *_wrap_Joystick_GetUMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9768,7 +10112,7 @@ static PyObject *_wrap_Joystick_GetVMin(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9793,7 +10137,7 @@ static PyObject *_wrap_Joystick_GetVMax(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9818,7 +10162,7 @@ static PyObject *_wrap_Joystick_HasRudder(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9843,7 +10187,7 @@ static PyObject *_wrap_Joystick_HasZ(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9868,7 +10212,7 @@ static PyObject *_wrap_Joystick_HasU(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9893,7 +10237,7 @@ static PyObject *_wrap_Joystick_HasV(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9918,7 +10262,7 @@ static PyObject *_wrap_Joystick_HasPOV(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9943,7 +10287,7 @@ static PyObject *_wrap_Joystick_HasPOV4Dir(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9968,7 +10312,7 @@ static PyObject *_wrap_Joystick_HasPOVCTS(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9983,13 +10327,20 @@ static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObj bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "win",(char *) "pollingFreq", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Joystick_SetCapture",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Joystick_SetCapture",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystick,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetCapture(arg2,arg3); @@ -9997,7 +10348,7 @@ static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10022,7 +10373,7 @@ static PyObject *_wrap_Joystick_ReleaseCapture(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10083,12 +10434,17 @@ static PyObject *_wrap_JoystickEvent_m_zPosition_set(PyObject *self, PyObject *a wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_zPosition", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_m_zPosition_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_zPosition_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_zPosition = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -10111,7 +10467,7 @@ static PyObject *_wrap_JoystickEvent_m_zPosition_get(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_zPosition); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10123,12 +10479,17 @@ static PyObject *_wrap_JoystickEvent_m_buttonChange_set(PyObject *self, PyObject wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_buttonChange", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_m_buttonChange_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_buttonChange_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_buttonChange = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -10151,7 +10512,7 @@ static PyObject *_wrap_JoystickEvent_m_buttonChange_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_buttonChange); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10163,12 +10524,17 @@ static PyObject *_wrap_JoystickEvent_m_buttonState_set(PyObject *self, PyObject wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_buttonState", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_m_buttonState_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_buttonState_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_buttonState = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -10191,7 +10557,7 @@ static PyObject *_wrap_JoystickEvent_m_buttonState_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_buttonState); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10203,12 +10569,17 @@ static PyObject *_wrap_JoystickEvent_m_joyStick_set(PyObject *self, PyObject *ar wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_joyStick", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_m_joyStick_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_joyStick_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->m_joyStick = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -10231,7 +10602,7 @@ static PyObject *_wrap_JoystickEvent_m_joyStick_get(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->m_joyStick); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10245,11 +10616,39 @@ static PyObject *_wrap_new_JoystickEvent(PyObject *self, PyObject *args, PyObjec int arg3 = (int) wxJOYSTICK1 ; int arg4 = (int) 0 ; wxJoystickEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "type",(char *) "state",(char *) "joystick",(char *) "change", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_JoystickEvent",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_JoystickEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxJoystickEvent *)new wxJoystickEvent(arg1,arg2,arg3,arg4); @@ -10311,7 +10710,7 @@ static PyObject *_wrap_JoystickEvent_GetZPosition(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10336,7 +10735,7 @@ static PyObject *_wrap_JoystickEvent_GetButtonState(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10361,7 +10760,7 @@ static PyObject *_wrap_JoystickEvent_GetButtonChange(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10386,7 +10785,7 @@ static PyObject *_wrap_JoystickEvent_GetJoystick(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10398,12 +10797,17 @@ static PyObject *_wrap_JoystickEvent_SetJoystick(PyObject *self, PyObject *args, wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "stick", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_SetJoystick",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetJoystick",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetJoystick(arg2); @@ -10423,12 +10827,17 @@ static PyObject *_wrap_JoystickEvent_SetButtonState(PyObject *self, PyObject *ar wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "state", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_SetButtonState",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetButtonState",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetButtonState(arg2); @@ -10448,12 +10857,17 @@ static PyObject *_wrap_JoystickEvent_SetButtonChange(PyObject *self, PyObject *a wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "change", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_SetButtonChange",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetButtonChange",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetButtonChange(arg2); @@ -10504,12 +10918,17 @@ static PyObject *_wrap_JoystickEvent_SetZPosition(PyObject *self, PyObject *args wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "zPos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:JoystickEvent_SetZPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetZPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetZPosition(arg2); @@ -10542,7 +10961,7 @@ static PyObject *_wrap_JoystickEvent_IsButton(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10567,7 +10986,7 @@ static PyObject *_wrap_JoystickEvent_IsMove(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10592,7 +11011,7 @@ static PyObject *_wrap_JoystickEvent_IsZMove(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10605,12 +11024,19 @@ static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args, int arg2 = (int) wxJOY_BUTTON_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:JoystickEvent_ButtonDown",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:JoystickEvent_ButtonDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxJoystickEvent const *)arg1)->ButtonDown(arg2); @@ -10618,7 +11044,7 @@ static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10631,12 +11057,19 @@ static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, Py int arg2 = (int) wxJOY_BUTTON_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:JoystickEvent_ButtonUp",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:JoystickEvent_ButtonUp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxJoystickEvent const *)arg1)->ButtonUp(arg2); @@ -10644,7 +11077,7 @@ static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10657,12 +11090,19 @@ static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args int arg2 = (int) wxJOY_BUTTON_ANY ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "but", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:JoystickEvent_ButtonIsDown",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:JoystickEvent_ButtonIsDown",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxJoystickEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxJoystickEvent const *)arg1)->ButtonIsDown(arg2); @@ -10670,7 +11110,7 @@ static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10704,7 +11144,7 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs } if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -10810,7 +11250,7 @@ static PyObject *_wrap_Wave_IsOk(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10834,13 +11274,13 @@ static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwarg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -10851,7 +11291,7 @@ static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11040,7 +11480,7 @@ static PyObject *_wrap_FileTypeInfo_IsValid(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11055,17 +11495,24 @@ static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "iconFile",(char *) "iconIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:FileTypeInfo_SetIcon",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FileTypeInfo_SetIcon",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileTypeInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetIcon((wxString const &)*arg2,arg3); @@ -11346,7 +11793,7 @@ static PyObject *_wrap_FileTypeInfo_GetExtensionsCount(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11405,7 +11852,7 @@ static PyObject *_wrap_FileTypeInfo_GetIconIndex(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11832,7 +12279,7 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj } if (obj3) { { - arg4 = (bool) SPyObj_AsBool(obj3); + arg4 = (bool) SWIG_PyObj_AsBool(obj3); if (PyErr_Occurred()) SWIG_fail; } } @@ -11843,7 +12290,7 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -11876,11 +12323,12 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cmd",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|Oi:FileType_SetDefaultIcon",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:FileType_SetDefaultIcon",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileType,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { @@ -11889,6 +12337,12 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P temp2 = True; } } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetDefaultIcon((wxString const &)*arg2,arg3); @@ -11896,7 +12350,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -11929,7 +12383,7 @@ static PyObject *_wrap_FileType_Unassociate(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12022,7 +12476,7 @@ static PyObject * FileType_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TheMimeTypesManager_set(PyObject *_val) { +static int _wrap_TheMimeTypesManager_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheMimeTypesManager is read-only."); return 1; } @@ -12067,7 +12521,7 @@ static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp1) delete arg1; @@ -12120,13 +12574,20 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg wxString *arg3 = (wxString *) &arg3_defvalue ; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mailcapStyle",(char *) "extraDir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:MimeTypesManager_Initialize",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:MimeTypesManager_Initialize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMimeTypesManager,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -12285,7 +12746,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -12296,7 +12757,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -12337,7 +12798,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -12459,7 +12920,7 @@ static PyObject *_wrap_MimeTypesManager_Unassociate(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -12497,7 +12958,7 @@ static PyObject * MimeTypesManager_swigregister(PyObject *self, PyObject *args) Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_ART_TOOLBAR_set(PyObject *_val) { +static int _wrap_ART_TOOLBAR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_TOOLBAR is read-only."); return 1; } @@ -12517,7 +12978,7 @@ static PyObject *_wrap_ART_TOOLBAR_get() { } -static int _wrap_ART_MENU_set(PyObject *_val) { +static int _wrap_ART_MENU_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_MENU is read-only."); return 1; } @@ -12537,7 +12998,7 @@ static PyObject *_wrap_ART_MENU_get() { } -static int _wrap_ART_FRAME_ICON_set(PyObject *_val) { +static int _wrap_ART_FRAME_ICON_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_FRAME_ICON is read-only."); return 1; } @@ -12557,7 +13018,7 @@ static PyObject *_wrap_ART_FRAME_ICON_get() { } -static int _wrap_ART_CMN_DIALOG_set(PyObject *_val) { +static int _wrap_ART_CMN_DIALOG_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_CMN_DIALOG is read-only."); return 1; } @@ -12577,7 +13038,7 @@ static PyObject *_wrap_ART_CMN_DIALOG_get() { } -static int _wrap_ART_HELP_BROWSER_set(PyObject *_val) { +static int _wrap_ART_HELP_BROWSER_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_BROWSER is read-only."); return 1; } @@ -12597,7 +13058,7 @@ static PyObject *_wrap_ART_HELP_BROWSER_get() { } -static int _wrap_ART_MESSAGE_BOX_set(PyObject *_val) { +static int _wrap_ART_MESSAGE_BOX_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_MESSAGE_BOX is read-only."); return 1; } @@ -12617,7 +13078,7 @@ static PyObject *_wrap_ART_MESSAGE_BOX_get() { } -static int _wrap_ART_OTHER_set(PyObject *_val) { +static int _wrap_ART_OTHER_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_OTHER is read-only."); return 1; } @@ -12637,7 +13098,7 @@ static PyObject *_wrap_ART_OTHER_get() { } -static int _wrap_ART_ADD_BOOKMARK_set(PyObject *_val) { +static int _wrap_ART_ADD_BOOKMARK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_ADD_BOOKMARK is read-only."); return 1; } @@ -12657,7 +13118,7 @@ static PyObject *_wrap_ART_ADD_BOOKMARK_get() { } -static int _wrap_ART_DEL_BOOKMARK_set(PyObject *_val) { +static int _wrap_ART_DEL_BOOKMARK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_DEL_BOOKMARK is read-only."); return 1; } @@ -12677,7 +13138,7 @@ static PyObject *_wrap_ART_DEL_BOOKMARK_get() { } -static int _wrap_ART_HELP_SIDE_PANEL_set(PyObject *_val) { +static int _wrap_ART_HELP_SIDE_PANEL_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_SIDE_PANEL is read-only."); return 1; } @@ -12697,7 +13158,7 @@ static PyObject *_wrap_ART_HELP_SIDE_PANEL_get() { } -static int _wrap_ART_HELP_SETTINGS_set(PyObject *_val) { +static int _wrap_ART_HELP_SETTINGS_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_SETTINGS is read-only."); return 1; } @@ -12717,7 +13178,7 @@ static PyObject *_wrap_ART_HELP_SETTINGS_get() { } -static int _wrap_ART_HELP_BOOK_set(PyObject *_val) { +static int _wrap_ART_HELP_BOOK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_BOOK is read-only."); return 1; } @@ -12737,7 +13198,7 @@ static PyObject *_wrap_ART_HELP_BOOK_get() { } -static int _wrap_ART_HELP_FOLDER_set(PyObject *_val) { +static int _wrap_ART_HELP_FOLDER_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_FOLDER is read-only."); return 1; } @@ -12757,7 +13218,7 @@ static PyObject *_wrap_ART_HELP_FOLDER_get() { } -static int _wrap_ART_HELP_PAGE_set(PyObject *_val) { +static int _wrap_ART_HELP_PAGE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_PAGE is read-only."); return 1; } @@ -12777,7 +13238,7 @@ static PyObject *_wrap_ART_HELP_PAGE_get() { } -static int _wrap_ART_GO_BACK_set(PyObject *_val) { +static int _wrap_ART_GO_BACK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_BACK is read-only."); return 1; } @@ -12797,7 +13258,7 @@ static PyObject *_wrap_ART_GO_BACK_get() { } -static int _wrap_ART_GO_FORWARD_set(PyObject *_val) { +static int _wrap_ART_GO_FORWARD_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_FORWARD is read-only."); return 1; } @@ -12817,7 +13278,7 @@ static PyObject *_wrap_ART_GO_FORWARD_get() { } -static int _wrap_ART_GO_UP_set(PyObject *_val) { +static int _wrap_ART_GO_UP_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_UP is read-only."); return 1; } @@ -12837,7 +13298,7 @@ static PyObject *_wrap_ART_GO_UP_get() { } -static int _wrap_ART_GO_DOWN_set(PyObject *_val) { +static int _wrap_ART_GO_DOWN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DOWN is read-only."); return 1; } @@ -12857,7 +13318,7 @@ static PyObject *_wrap_ART_GO_DOWN_get() { } -static int _wrap_ART_GO_TO_PARENT_set(PyObject *_val) { +static int _wrap_ART_GO_TO_PARENT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_TO_PARENT is read-only."); return 1; } @@ -12877,7 +13338,7 @@ static PyObject *_wrap_ART_GO_TO_PARENT_get() { } -static int _wrap_ART_GO_HOME_set(PyObject *_val) { +static int _wrap_ART_GO_HOME_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_HOME is read-only."); return 1; } @@ -12897,7 +13358,7 @@ static PyObject *_wrap_ART_GO_HOME_get() { } -static int _wrap_ART_FILE_OPEN_set(PyObject *_val) { +static int _wrap_ART_FILE_OPEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_FILE_OPEN is read-only."); return 1; } @@ -12917,7 +13378,7 @@ static PyObject *_wrap_ART_FILE_OPEN_get() { } -static int _wrap_ART_PRINT_set(PyObject *_val) { +static int _wrap_ART_PRINT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_PRINT is read-only."); return 1; } @@ -12937,7 +13398,7 @@ static PyObject *_wrap_ART_PRINT_get() { } -static int _wrap_ART_HELP_set(PyObject *_val) { +static int _wrap_ART_HELP_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_HELP is read-only."); return 1; } @@ -12957,7 +13418,7 @@ static PyObject *_wrap_ART_HELP_get() { } -static int _wrap_ART_TIP_set(PyObject *_val) { +static int _wrap_ART_TIP_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_TIP is read-only."); return 1; } @@ -12977,7 +13438,7 @@ static PyObject *_wrap_ART_TIP_get() { } -static int _wrap_ART_REPORT_VIEW_set(PyObject *_val) { +static int _wrap_ART_REPORT_VIEW_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_REPORT_VIEW is read-only."); return 1; } @@ -12997,7 +13458,7 @@ static PyObject *_wrap_ART_REPORT_VIEW_get() { } -static int _wrap_ART_LIST_VIEW_set(PyObject *_val) { +static int _wrap_ART_LIST_VIEW_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_LIST_VIEW is read-only."); return 1; } @@ -13017,7 +13478,7 @@ static PyObject *_wrap_ART_LIST_VIEW_get() { } -static int _wrap_ART_NEW_DIR_set(PyObject *_val) { +static int _wrap_ART_NEW_DIR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_NEW_DIR is read-only."); return 1; } @@ -13037,7 +13498,7 @@ static PyObject *_wrap_ART_NEW_DIR_get() { } -static int _wrap_ART_FOLDER_set(PyObject *_val) { +static int _wrap_ART_FOLDER_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER is read-only."); return 1; } @@ -13057,7 +13518,7 @@ static PyObject *_wrap_ART_FOLDER_get() { } -static int _wrap_ART_GO_DIR_UP_set(PyObject *_val) { +static int _wrap_ART_GO_DIR_UP_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DIR_UP is read-only."); return 1; } @@ -13077,7 +13538,7 @@ static PyObject *_wrap_ART_GO_DIR_UP_get() { } -static int _wrap_ART_EXECUTABLE_FILE_set(PyObject *_val) { +static int _wrap_ART_EXECUTABLE_FILE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_EXECUTABLE_FILE is read-only."); return 1; } @@ -13097,7 +13558,7 @@ static PyObject *_wrap_ART_EXECUTABLE_FILE_get() { } -static int _wrap_ART_NORMAL_FILE_set(PyObject *_val) { +static int _wrap_ART_NORMAL_FILE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_NORMAL_FILE is read-only."); return 1; } @@ -13117,7 +13578,7 @@ static PyObject *_wrap_ART_NORMAL_FILE_get() { } -static int _wrap_ART_TICK_MARK_set(PyObject *_val) { +static int _wrap_ART_TICK_MARK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_TICK_MARK is read-only."); return 1; } @@ -13137,7 +13598,7 @@ static PyObject *_wrap_ART_TICK_MARK_get() { } -static int _wrap_ART_CROSS_MARK_set(PyObject *_val) { +static int _wrap_ART_CROSS_MARK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_CROSS_MARK is read-only."); return 1; } @@ -13157,7 +13618,7 @@ static PyObject *_wrap_ART_CROSS_MARK_get() { } -static int _wrap_ART_ERROR_set(PyObject *_val) { +static int _wrap_ART_ERROR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_ERROR is read-only."); return 1; } @@ -13177,7 +13638,7 @@ static PyObject *_wrap_ART_ERROR_get() { } -static int _wrap_ART_QUESTION_set(PyObject *_val) { +static int _wrap_ART_QUESTION_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_QUESTION is read-only."); return 1; } @@ -13197,7 +13658,7 @@ static PyObject *_wrap_ART_QUESTION_get() { } -static int _wrap_ART_WARNING_set(PyObject *_val) { +static int _wrap_ART_WARNING_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_WARNING is read-only."); return 1; } @@ -13217,7 +13678,7 @@ static PyObject *_wrap_ART_WARNING_get() { } -static int _wrap_ART_INFORMATION_set(PyObject *_val) { +static int _wrap_ART_INFORMATION_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_INFORMATION is read-only."); return 1; } @@ -13237,7 +13698,7 @@ static PyObject *_wrap_ART_INFORMATION_get() { } -static int _wrap_ART_MISSING_IMAGE_set(PyObject *_val) { +static int _wrap_ART_MISSING_IMAGE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_MISSING_IMAGE is read-only."); return 1; } @@ -13348,7 +13809,7 @@ static PyObject *_wrap_ArtProvider_PopProvider(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13373,7 +13834,7 @@ static PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -13614,7 +14075,7 @@ static PyObject *_wrap_ConfigBase_Get(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ConfigBase_Get",kwnames,&obj0)) goto fail; if (obj0) { { - arg1 = (bool) SPyObj_AsBool(obj0); + arg1 = (bool) SWIG_PyObj_AsBool(obj0); if (PyErr_Occurred()) SWIG_fail; } } @@ -13780,12 +14241,17 @@ static PyObject *_wrap_ConfigBase_GetNextGroup(PyObject *self, PyObject *args, P long arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ConfigBase_GetNextGroup",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_GetNextGroup",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxConfigBase_GetNextGroup(arg1,arg2); @@ -13831,12 +14297,17 @@ static PyObject *_wrap_ConfigBase_GetNextEntry(PyObject *self, PyObject *args, P long arg2 ; PyObject *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ConfigBase_GetNextEntry",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_GetNextEntry",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (PyObject *)wxConfigBase_GetNextEntry(arg1,arg2); @@ -13866,7 +14337,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -13877,7 +14348,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -13899,7 +14370,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -13910,7 +14381,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -13943,7 +14414,7 @@ static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -13984,7 +14455,7 @@ static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14025,7 +14496,7 @@ static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14066,7 +14537,7 @@ static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -14156,17 +14627,24 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "key",(char *) "defaultVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:ConfigBase_ReadInt",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ConfigBase_ReadInt",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (long)wxConfigBase_ReadInt(arg1,(wxString const &)*arg2,arg3); @@ -14174,7 +14652,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); { if (temp2) delete arg2; @@ -14198,17 +14676,24 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "key",(char *) "defaultVal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|d:ConfigBase_ReadFloat",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ConfigBase_ReadFloat",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (double)wxConfigBase_ReadFloat(arg1,(wxString const &)*arg2,arg3); @@ -14216,7 +14701,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); { if (temp2) delete arg2; @@ -14254,7 +14739,7 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -14265,7 +14750,7 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14314,7 +14799,7 @@ static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14346,17 +14831,22 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "key",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:ConfigBase_WriteInt",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ConfigBase_WriteInt",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Write((wxString const &)*arg2,arg3); @@ -14364,7 +14854,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14388,17 +14878,22 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "key",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:ConfigBase_WriteFloat",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ConfigBase_WriteFloat",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Write((wxString const &)*arg2,arg3); @@ -14406,7 +14901,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14443,7 +14938,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb temp2 = True; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -14453,7 +14948,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14483,7 +14978,7 @@ static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -14494,7 +14989,7 @@ static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14535,7 +15030,7 @@ static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14592,7 +15087,7 @@ static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14638,7 +15133,7 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -14649,7 +15144,7 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14690,7 +15185,7 @@ static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp2) delete arg2; @@ -14723,7 +15218,7 @@ static PyObject *_wrap_ConfigBase_DeleteAll(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14748,7 +15243,7 @@ static PyObject *_wrap_ConfigBase_IsExpandingEnvVars(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14769,7 +15264,7 @@ static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -14801,7 +15296,7 @@ static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -14837,7 +15332,7 @@ static PyObject *_wrap_ConfigBase_IsRecordingDefaults(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15038,12 +15533,17 @@ static PyObject *_wrap_ConfigBase_SetStyle(PyObject *self, PyObject *args, PyObj wxConfigBase *arg1 = (wxConfigBase *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:ConfigBase_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -15076,7 +15576,7 @@ static PyObject *_wrap_ConfigBase_GetStyle(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -15216,11 +15716,12 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "appName",(char *) "vendorName",(char *) "localFilename",(char *) "globalFilename",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOl:new_Config",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:new_Config",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -15249,6 +15750,12 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar temp4 = True; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxConfig *)new wxConfig((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,arg5); @@ -15346,11 +15853,12 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject * PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "appName",(char *) "vendorName",(char *) "localFilename",(char *) "globalFilename",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOl:new_FileConfig",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:new_FileConfig",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -15379,6 +15887,12 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject * temp4 = True; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFileConfig *)new wxFileConfig((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,arg5); @@ -15500,7 +16014,7 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k } -static int _wrap_DateFormatStr_set(PyObject *_val) { +static int _wrap_DateFormatStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DateFormatStr is read-only."); return 1; } @@ -15520,7 +16034,7 @@ static PyObject *_wrap_DateFormatStr_get() { } -static int _wrap_TimeSpanFormatStr_set(PyObject *_val) { +static int _wrap_TimeSpanFormatStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TimeSpanFormatStr is read-only."); return 1; } @@ -15543,11 +16057,16 @@ static PyObject *_wrap_TimeSpanFormatStr_get() { static PyObject *_wrap_DateTime_SetCountry(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateTime_SetCountry",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateTime_SetCountry",kwnames,&obj0)) goto fail; + { + arg1 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxDateTime::SetCountry((wxDateTime::Country )arg1); @@ -15577,7 +16096,7 @@ static PyObject *_wrap_DateTime_GetCountry(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15588,11 +16107,18 @@ static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *self, PyObject * PyObject *resultobj; int arg1 = (int) wxDateTime::Country_Default ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:DateTime_IsWestEuropeanCountry",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_IsWestEuropeanCountry",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxDateTime::IsWestEuropeanCountry((wxDateTime::Country )arg1); @@ -15600,7 +16126,7 @@ static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15611,11 +16137,18 @@ static PyObject *_wrap_DateTime_GetCurrentYear(PyObject *self, PyObject *args, P PyObject *resultobj; int arg1 = (int) wxDateTime::Gregorian ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:DateTime_GetCurrentYear",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCurrentYear",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetCurrentYear((wxDateTime::Calendar )arg1); @@ -15623,7 +16156,7 @@ static PyObject *_wrap_DateTime_GetCurrentYear(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15634,11 +16167,16 @@ static PyObject *_wrap_DateTime_ConvertYearToBC(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateTime_ConvertYearToBC",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateTime_ConvertYearToBC",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::ConvertYearToBC(arg1); @@ -15646,7 +16184,7 @@ static PyObject *_wrap_DateTime_ConvertYearToBC(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15657,11 +16195,18 @@ static PyObject *_wrap_DateTime_GetCurrentMonth(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 = (int) wxDateTime::Gregorian ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:DateTime_GetCurrentMonth",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCurrentMonth",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetCurrentMonth((wxDateTime::Calendar )arg1); @@ -15669,7 +16214,7 @@ static PyObject *_wrap_DateTime_GetCurrentMonth(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15681,11 +16226,25 @@ static PyObject *_wrap_DateTime_IsLeapYear(PyObject *self, PyObject *args, PyObj int arg1 = (int) wxDateTime::Inv_Year ; int arg2 = (int) wxDateTime::Gregorian ; bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:DateTime_IsLeapYear",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_IsLeapYear",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxDateTime::IsLeapYear(arg1,(wxDateTime::Calendar )arg2); @@ -15693,7 +16252,7 @@ static PyObject *_wrap_DateTime_IsLeapYear(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15704,11 +16263,18 @@ static PyObject *_wrap_DateTime_GetCentury(PyObject *self, PyObject *args, PyObj PyObject *resultobj; int arg1 = (int) wxDateTime::Inv_Year ; int result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:DateTime_GetCentury",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCentury",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetCentury(arg1); @@ -15716,7 +16282,7 @@ static PyObject *_wrap_DateTime_GetCentury(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15728,11 +16294,23 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject * int arg1 ; int arg2 = (int) wxDateTime::Gregorian ; int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:DateTime_GetNumberOfDaysinYear",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetNumberOfDaysinYear",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetNumberOfDays(arg1,(wxDateTime::Calendar )arg2); @@ -15740,7 +16318,7 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15753,11 +16331,30 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject int arg2 = (int) wxDateTime::Inv_Year ; int arg3 = (int) wxDateTime::Gregorian ; int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "month",(char *) "year",(char *) "cal", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|ii:DateTime_GetNumberOfDaysInMonth",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetNumberOfDaysInMonth",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (wxDateTime::Calendar) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxDateTime::GetNumberOfDays((wxDateTime::Month )arg1,arg2,(wxDateTime::Calendar )arg3); @@ -15765,7 +16362,7 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15777,11 +16374,23 @@ static PyObject *_wrap_DateTime_GetMonthName(PyObject *self, PyObject *args, PyO int arg1 ; int arg2 = (int) wxDateTime::Name_Full ; wxString result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "month",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:DateTime_GetMonthName",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetMonthName",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxDateTime::NameFlags) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateTime::GetMonthName((wxDateTime::Month )arg1,(wxDateTime::NameFlags )arg2); @@ -15807,11 +16416,23 @@ static PyObject *_wrap_DateTime_GetWeekDayName(PyObject *self, PyObject *args, P int arg1 ; int arg2 = (int) wxDateTime::Name_Full ; wxString result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:DateTime_GetWeekDayName",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetWeekDayName",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxDateTime::NameFlags) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateTime::GetWeekDayName((wxDateTime::WeekDay )arg1,(wxDateTime::NameFlags )arg2); @@ -15890,11 +16511,25 @@ static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *self, PyObject *args, int arg1 = (int) wxDateTime::Inv_Year ; int arg2 = (int) wxDateTime::Country_Default ; bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:DateTime_IsDSTApplicable",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_IsDSTApplicable",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxDateTime::IsDSTApplicable(arg1,(wxDateTime::Country )arg2); @@ -15902,7 +16537,7 @@ static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15914,11 +16549,25 @@ static PyObject *_wrap_DateTime_GetBeginDST(PyObject *self, PyObject *args, PyOb int arg1 = (int) wxDateTime::Inv_Year ; int arg2 = (int) wxDateTime::Country_Default ; wxDateTime result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:DateTime_GetBeginDST",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_GetBeginDST",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateTime::GetBeginDST(arg1,(wxDateTime::Country )arg2); @@ -15942,11 +16591,25 @@ static PyObject *_wrap_DateTime_GetEndDST(PyObject *self, PyObject *args, PyObje int arg1 = (int) wxDateTime::Inv_Year ; int arg2 = (int) wxDateTime::Country_Default ; wxDateTime result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "year",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:DateTime_GetEndDST",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_GetEndDST",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateTime::GetEndDST(arg1,(wxDateTime::Country )arg2); @@ -16076,7 +16739,7 @@ static PyObject *_wrap_new_DateTimeFromTimeT(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DateTimeFromTimeT",kwnames,&obj0)) goto fail; { - arg1 = (time_t) SPyObj_AsUnsignedInt(obj0); + arg1 = (time_t) SWIG_PyObj_AsUnsignedInt(obj0); if (PyErr_Occurred()) SWIG_fail; } { @@ -16097,11 +16760,16 @@ static PyObject *_wrap_new_DateTimeFromJDN(PyObject *self, PyObject *args, PyObj PyObject *resultobj; double arg1 ; wxDateTime *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "jdn", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"d:new_DateTimeFromJDN",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DateTimeFromJDN",kwnames,&obj0)) goto fail; + { + arg1 = (double) SWIG_PyObj_AsDouble(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1); @@ -16123,11 +16791,37 @@ static PyObject *_wrap_new_DateTimeFromHMS(PyObject *self, PyObject *args, PyObj int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxDateTime *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|iii:new_DateTimeFromHMS",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DateTimeFromHMS",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1,arg2,arg3,arg4); @@ -16152,11 +16846,58 @@ static PyObject *_wrap_new_DateTimeFromDMY(PyObject *self, PyObject *args, PyObj int arg6 = (int) 0 ; int arg7 = (int) 0 ; wxDateTime *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 *) "day",(char *) "month",(char *) "year",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|iiiiii:new_DateTimeFromDMY",kwnames,&arg1,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_DateTimeFromDMY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1,(wxDateTime::Month )arg2,arg3,arg4,arg5,arg6,arg7); @@ -16237,7 +16978,7 @@ static PyObject *_wrap_DateTime_SetTimeT(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetTimeT",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (time_t) SPyObj_AsUnsignedInt(obj1); + arg2 = (time_t) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16263,12 +17004,17 @@ static PyObject *_wrap_DateTime_SetJDN(PyObject *self, PyObject *args, PyObject double arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "jdn", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:DateTime_SetJDN",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetJDN",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16295,12 +17041,38 @@ static PyObject *_wrap_DateTime_SetHMS(PyObject *self, PyObject *args, PyObject int arg5 = (int) 0 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iii:DateTime_SetHMS",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DateTime_SetHMS",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16330,12 +17102,59 @@ static PyObject *_wrap_DateTime_Set(PyObject *self, PyObject *args, PyObject *kw int arg8 = (int) 0 ; wxDateTime *result; 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 *) "day",(char *) "month",(char *) "year",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iiiiii:DateTime_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:DateTime_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16387,12 +17206,17 @@ static PyObject *_wrap_DateTime_SetYear(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetYear",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetYear",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16416,12 +17240,17 @@ static PyObject *_wrap_DateTime_SetMonth(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "month", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetMonth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMonth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16445,12 +17274,17 @@ static PyObject *_wrap_DateTime_SetDay(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "day", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16474,12 +17308,17 @@ static PyObject *_wrap_DateTime_SetHour(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetHour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetHour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16503,12 +17342,17 @@ static PyObject *_wrap_DateTime_SetMinute(PyObject *self, PyObject *args, PyObje int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minute", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetMinute",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMinute",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16532,12 +17376,17 @@ static PyObject *_wrap_DateTime_SetSecond(PyObject *self, PyObject *args, PyObje int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "second", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetSecond",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetSecond",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16561,12 +17410,17 @@ static PyObject *_wrap_DateTime_SetMillisecond(PyObject *self, PyObject *args, P int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "millisecond", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetMillisecond",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMillisecond",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16591,12 +17445,24 @@ static PyObject *_wrap_DateTime_SetToWeekDayInSameWeek(PyObject *self, PyObject int arg3 = (int) wxDateTime::Monday_First ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:DateTime_SetToWeekDayInSameWeek",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DateTime_SetToWeekDayInSameWeek",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16621,12 +17487,24 @@ static PyObject *_wrap_DateTime_GetWeekDayInSameWeek(PyObject *self, PyObject *a int arg3 = (int) wxDateTime::Monday_First ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|i:DateTime_GetWeekDayInSameWeek",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DateTime_GetWeekDayInSameWeek",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetWeekDayInSameWeek((wxDateTime::WeekDay )arg2,(wxDateTime::WeekFlags )arg3); @@ -16651,12 +17529,17 @@ static PyObject *_wrap_DateTime_SetToNextWeekDay(PyObject *self, PyObject *args, int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetToNextWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToNextWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16680,12 +17563,17 @@ static PyObject *_wrap_DateTime_GetNextWeekDay(PyObject *self, PyObject *args, P int arg2 ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_GetNextWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetNextWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetNextWeekDay((wxDateTime::WeekDay )arg2); @@ -16710,12 +17598,17 @@ static PyObject *_wrap_DateTime_SetToPrevWeekDay(PyObject *self, PyObject *args, int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetToPrevWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToPrevWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16739,12 +17632,17 @@ static PyObject *_wrap_DateTime_GetPrevWeekDay(PyObject *self, PyObject *args, P int arg2 ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_GetPrevWeekDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetPrevWeekDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetPrevWeekDay((wxDateTime::WeekDay )arg2); @@ -16772,12 +17670,38 @@ static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *self, PyObject *args, PyO int arg5 = (int) wxDateTime::Inv_Year ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "n",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iii:DateTime_SetToWeekDay",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DateTime_SetToWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetToWeekDay((wxDateTime::WeekDay )arg2,arg3,(wxDateTime::Month )arg4,arg5); @@ -16785,7 +17709,7 @@ static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16800,12 +17724,31 @@ static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *self, PyObject *args, int arg4 = (int) wxDateTime::Inv_Year ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_SetToLastWeekDay",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_SetToLastWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetToLastWeekDay((wxDateTime::WeekDay )arg2,(wxDateTime::Month )arg3,arg4); @@ -16813,7 +17756,7 @@ static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16828,12 +17771,31 @@ static PyObject *_wrap_DateTime_GetLastWeekDay(PyObject *self, PyObject *args, P int arg4 = (int) wxDateTime::Inv_Year ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weekday",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_GetLastWeekDay",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_GetLastWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetLastWeekDay((wxDateTime::WeekDay )arg2,(wxDateTime::Month )arg3,arg4); @@ -16860,12 +17822,31 @@ static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyO int arg4 = (int) wxDateTime::Monday_First ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numWeek",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_SetToTheWeek",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_SetToTheWeek",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetToTheWeek(arg2,(wxDateTime::WeekDay )arg3,(wxDateTime::WeekFlags )arg4); @@ -16873,7 +17854,7 @@ static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16888,12 +17869,31 @@ static PyObject *_wrap_DateTime_GetWeek(PyObject *self, PyObject *args, PyObject int arg4 = (int) wxDateTime::Monday_First ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numWeek",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_GetWeek",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_GetWeek",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (wxDateTime::WeekDay) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetWeek(arg2,(wxDateTime::WeekDay )arg3,(wxDateTime::WeekFlags )arg4); @@ -16919,12 +17919,26 @@ static PyObject *_wrap_DateTime_SetToLastMonthDay(PyObject *self, PyObject *args int arg3 = (int) wxDateTime::Inv_Year ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:DateTime_SetToLastMonthDay",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_SetToLastMonthDay",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16949,12 +17963,26 @@ static PyObject *_wrap_DateTime_GetLastMonthDay(PyObject *self, PyObject *args, int arg3 = (int) wxDateTime::Inv_Year ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "month",(char *) "year", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:DateTime_GetLastMonthDay",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetLastMonthDay",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::Month) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetLastMonthDay((wxDateTime::Month )arg2,arg3); @@ -16979,12 +18007,17 @@ static PyObject *_wrap_DateTime_SetToYearDay(PyObject *self, PyObject *args, PyO int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "yday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetToYearDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToYearDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -17008,12 +18041,17 @@ static PyObject *_wrap_DateTime_GetYearDay(PyObject *self, PyObject *args, PyObj int arg2 ; wxDateTime result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "yday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_GetYearDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetYearDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetYearDay(arg2); @@ -17050,7 +18088,7 @@ static PyObject *_wrap_DateTime_GetJulianDayNumber(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17075,7 +18113,7 @@ static PyObject *_wrap_DateTime_GetJDN(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17100,7 +18138,7 @@ static PyObject *_wrap_DateTime_GetModifiedJulianDayNumber(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17125,7 +18163,7 @@ static PyObject *_wrap_DateTime_GetMJD(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17150,7 +18188,7 @@ static PyObject *_wrap_DateTime_GetRataDie(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -17179,7 +18217,7 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -17229,7 +18267,7 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -17271,7 +18309,7 @@ static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject * if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -17308,7 +18346,7 @@ static PyObject *_wrap_DateTime_MakeGMT(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -17335,12 +18373,19 @@ static PyObject *_wrap_DateTime_IsDST(PyObject *self, PyObject *args, PyObject * int arg2 = (int) wxDateTime::Country_Default ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DateTime_IsDST",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_IsDST",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->IsDST((wxDateTime::Country )arg2); @@ -17348,7 +18393,7 @@ static PyObject *_wrap_DateTime_IsDST(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17373,7 +18418,7 @@ static PyObject *_wrap_DateTime_IsValid(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17398,7 +18443,7 @@ static PyObject *_wrap_DateTime_GetTicks(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -17433,7 +18478,7 @@ static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17474,7 +18519,7 @@ static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17515,7 +18560,7 @@ static PyObject *_wrap_DateTime_GetDay(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17556,7 +18601,7 @@ static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17597,7 +18642,7 @@ static PyObject *_wrap_DateTime_GetHour(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17638,7 +18683,7 @@ static PyObject *_wrap_DateTime_GetMinute(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17679,7 +18724,7 @@ static PyObject *_wrap_DateTime_GetSecond(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17720,7 +18765,7 @@ static PyObject *_wrap_DateTime_GetMillisecond(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17761,7 +18806,7 @@ static PyObject *_wrap_DateTime_GetDayOfYear(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; } @@ -17783,13 +18828,20 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py int result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags",(char *) "tz", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:DateTime_GetWeekOfYear",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetWeekOfYear",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj2)); @@ -17803,7 +18855,7 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp3) delete arg3; } @@ -17825,13 +18877,20 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P int result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags",(char *) "tz", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:DateTime_GetWeekOfMonth",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetWeekOfMonth",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::WeekFlags) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj2)); @@ -17845,7 +18904,7 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp3) delete arg3; } @@ -17864,12 +18923,19 @@ static PyObject *_wrap_DateTime_IsWorkDay(PyObject *self, PyObject *args, PyObje int arg2 = (int) wxDateTime::Country_Default ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "country", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DateTime_IsWorkDay",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_IsWorkDay",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDateTime::Country) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxDateTime const *)arg1)->IsWorkDay((wxDateTime::Country )arg2); @@ -17877,7 +18943,7 @@ static PyObject *_wrap_DateTime_IsWorkDay(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17908,7 +18974,7 @@ static PyObject *_wrap_DateTime_IsEqualTo(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17939,7 +19005,7 @@ static PyObject *_wrap_DateTime_IsEarlierThan(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17970,7 +19036,7 @@ static PyObject *_wrap_DateTime_IsLaterThan(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18007,7 +19073,7 @@ static PyObject *_wrap_DateTime_IsStrictlyBetween(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18044,7 +19110,7 @@ static PyObject *_wrap_DateTime_IsBetween(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18075,7 +19141,7 @@ static PyObject *_wrap_DateTime_IsSameDate(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18106,7 +19172,7 @@ static PyObject *_wrap_DateTime_IsSameTime(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18143,7 +19209,7 @@ static PyObject *_wrap_DateTime_IsEqualUpTo(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18920,7 +19986,7 @@ static PyObject *_wrap_DateTime___lt__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18948,7 +20014,7 @@ static PyObject *_wrap_DateTime___le__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18976,7 +20042,7 @@ static PyObject *_wrap_DateTime___gt__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19004,7 +20070,7 @@ static PyObject *_wrap_DateTime___ge__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19032,7 +20098,7 @@ static PyObject *_wrap_DateTime___eq__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19060,7 +20126,7 @@ static PyObject *_wrap_DateTime___ne__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19093,7 +20159,7 @@ static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19154,7 +20220,7 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19203,7 +20269,7 @@ static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19244,7 +20310,7 @@ static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19285,7 +20351,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -19501,11 +20567,16 @@ static PyObject *_wrap_TimeSpan_Seconds(PyObject *self, PyObject *args, PyObject PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "sec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Seconds",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Seconds",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Seconds(arg1); @@ -19554,11 +20625,16 @@ static PyObject *_wrap_TimeSpan_Minutes(PyObject *self, PyObject *args, PyObject PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Minutes",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Minutes",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Minutes(arg1); @@ -19607,11 +20683,16 @@ static PyObject *_wrap_TimeSpan_Hours(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "hours", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Hours",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Hours",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Hours(arg1); @@ -19660,11 +20741,16 @@ static PyObject *_wrap_TimeSpan_Days(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "days", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Days",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Days",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Days(arg1); @@ -19713,11 +20799,16 @@ static PyObject *_wrap_TimeSpan_Weeks(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; long arg1 ; wxTimeSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "days", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"l:TimeSpan_Weeks",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Weeks",kwnames,&obj0)) goto fail; + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan::Weeks(arg1); @@ -19769,11 +20860,39 @@ static PyObject *_wrap_new_TimeSpan(PyObject *self, PyObject *args, PyObject *kw long arg3 = (long) 0 ; long arg4 = (long) 0 ; wxTimeSpan *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "hours",(char *) "minutes",(char *) "seconds",(char *) "milliseconds", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|llll:new_TimeSpan",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TimeSpan",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (long) SWIG_PyObj_AsLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTimeSpan *)new wxTimeSpan(arg1,arg2,arg3,arg4); @@ -19886,12 +21005,17 @@ static PyObject *_wrap_TimeSpan_Multiply(PyObject *self, PyObject *args, PyObjec int arg2 ; wxTimeSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TimeSpan_Multiply",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan_Multiply",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -20040,12 +21164,17 @@ static PyObject *_wrap_TimeSpan___imul__(PyObject *self, PyObject *args, PyObjec int arg2 ; wxTimeSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TimeSpan___imul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___imul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -20167,12 +21296,17 @@ static PyObject *_wrap_TimeSpan___mul__(PyObject *self, PyObject *args, PyObject int arg2 ; wxTimeSpan result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TimeSpan___mul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___mul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan___mul__(arg1,arg2); @@ -20197,12 +21331,17 @@ static PyObject *_wrap_TimeSpan___rmul__(PyObject *self, PyObject *args, PyObjec int arg2 ; wxTimeSpan result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:TimeSpan___rmul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___rmul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxTimeSpan___rmul__(arg1,arg2); @@ -20245,7 +21384,7 @@ static PyObject *_wrap_TimeSpan___lt__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20276,7 +21415,7 @@ static PyObject *_wrap_TimeSpan___le__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20307,7 +21446,7 @@ static PyObject *_wrap_TimeSpan___gt__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20338,7 +21477,7 @@ static PyObject *_wrap_TimeSpan___ge__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20369,7 +21508,7 @@ static PyObject *_wrap_TimeSpan___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20400,7 +21539,7 @@ static PyObject *_wrap_TimeSpan___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20425,7 +21564,7 @@ static PyObject *_wrap_TimeSpan_IsNull(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20450,7 +21589,7 @@ static PyObject *_wrap_TimeSpan_IsPositive(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20475,7 +21614,7 @@ static PyObject *_wrap_TimeSpan_IsNegative(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20506,7 +21645,7 @@ static PyObject *_wrap_TimeSpan_IsEqualTo(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20537,7 +21676,7 @@ static PyObject *_wrap_TimeSpan_IsLongerThan(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20568,7 +21707,7 @@ static PyObject *_wrap_TimeSpan_IsShorterThan(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20593,7 +21732,7 @@ static PyObject *_wrap_TimeSpan_GetWeeks(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20618,7 +21757,7 @@ static PyObject *_wrap_TimeSpan_GetDays(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20643,7 +21782,7 @@ static PyObject *_wrap_TimeSpan_GetHours(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20668,7 +21807,7 @@ static PyObject *_wrap_TimeSpan_GetMinutes(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20811,11 +21950,39 @@ static PyObject *_wrap_new_DateSpan(PyObject *self, PyObject *args, PyObject *kw int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxDateSpan *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "years",(char *) "months",(char *) "weeks",(char *) "days", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_DateSpan",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_DateSpan",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateSpan *)new wxDateSpan(arg1,arg2,arg3,arg4); @@ -20858,11 +22025,16 @@ static PyObject *_wrap_DateSpan_Days(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; int arg1 ; wxDateSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "days", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateSpan_Days",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Days",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan::Days(arg1); @@ -20911,11 +22083,16 @@ static PyObject *_wrap_DateSpan_Weeks(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; wxDateSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "weeks", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateSpan_Weeks",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Weeks",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan::Weeks(arg1); @@ -20964,11 +22141,16 @@ static PyObject *_wrap_DateSpan_Months(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 ; wxDateSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "mon", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateSpan_Months",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Months",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan::Months(arg1); @@ -21017,11 +22199,16 @@ static PyObject *_wrap_DateSpan_Years(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; wxDateSpan result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "years", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:DateSpan_Years",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Years",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan::Years(arg1); @@ -21072,12 +22259,17 @@ static PyObject *_wrap_DateSpan_SetYears(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_SetYears",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetYears",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21101,12 +22293,17 @@ static PyObject *_wrap_DateSpan_SetMonths(PyObject *self, PyObject *args, PyObje int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_SetMonths",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetMonths",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21130,12 +22327,17 @@ static PyObject *_wrap_DateSpan_SetWeeks(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_SetWeeks",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetWeeks",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21159,12 +22361,17 @@ static PyObject *_wrap_DateSpan_SetDays(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_SetDays",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetDays",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21200,7 +22407,7 @@ static PyObject *_wrap_DateSpan_GetYears(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21225,7 +22432,7 @@ static PyObject *_wrap_DateSpan_GetMonths(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21250,7 +22457,7 @@ static PyObject *_wrap_DateSpan_GetWeeks(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21275,7 +22482,7 @@ static PyObject *_wrap_DateSpan_GetDays(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21300,7 +22507,7 @@ static PyObject *_wrap_DateSpan_GetTotalDays(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -21409,12 +22616,17 @@ static PyObject *_wrap_DateSpan_Multiply(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "factor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan_Multiply",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_Multiply",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21534,12 +22746,17 @@ static PyObject *_wrap_DateSpan___imul__(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "factor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan___imul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___imul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -21633,12 +22850,17 @@ static PyObject *_wrap_DateSpan___mul__(PyObject *self, PyObject *args, PyObject int arg2 ; wxDateSpan result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan___mul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___mul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan___mul__(arg1,arg2); @@ -21663,12 +22885,17 @@ static PyObject *_wrap_DateSpan___rmul__(PyObject *self, PyObject *args, PyObjec int arg2 ; wxDateSpan result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateSpan___rmul__",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___rmul__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDateSpan___rmul__(arg1,arg2); @@ -21711,7 +22938,7 @@ static PyObject *_wrap_DateSpan___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21742,7 +22969,7 @@ static PyObject *_wrap_DateSpan___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21771,7 +22998,7 @@ static PyObject *_wrap_GetLocalTime(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21793,7 +23020,7 @@ static PyObject *_wrap_GetUTCTime(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21815,7 +23042,7 @@ static PyObject *_wrap_GetCurrentTime(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -21859,11 +23086,16 @@ static PyObject *_wrap_new_DataFormat(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; wxDataFormat *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:new_DataFormat",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DataFormat",kwnames,&obj0)) goto fail; + { + arg1 = (wxDataFormatId) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDataFormat *)new wxDataFormat((wxDataFormatId )arg1); @@ -21946,9 +23178,14 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args) int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi:DataFormat___eq__",&obj0,&arg2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___eq__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxDataFormat const *)arg1)->operator ==(arg2); @@ -21956,7 +23193,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -21969,9 +23206,14 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oi:DataFormat___ne__",&obj0,&arg2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___ne__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxDataFormat const *)arg1)->operator !=(arg2); @@ -21979,7 +23221,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22007,7 +23249,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_1(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22062,7 +23304,7 @@ static PyObject *_wrap_DataFormat___eq__(PyObject *self, PyObject *args) { } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -22102,7 +23344,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_1(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22157,7 +23399,7 @@ static PyObject *_wrap_DataFormat___ne__(PyObject *self, PyObject *args) { } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -22181,12 +23423,17 @@ static PyObject *_wrap_DataFormat_SetType(PyObject *self, PyObject *args, PyObje wxDataFormat *arg1 = (wxDataFormat *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "format", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DataFormat_SetType",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DataFormat_SetType",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDataFormatId) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetType((wxDataFormatId )arg2); @@ -22219,7 +23466,7 @@ static PyObject *_wrap_DataFormat_GetType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -22304,7 +23551,7 @@ static PyObject * DataFormat_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_FormatInvalid_set(PyObject *_val) { +static int _wrap_FormatInvalid_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FormatInvalid is read-only."); return 1; } @@ -22348,12 +23595,19 @@ static PyObject *_wrap_DataObject_GetPreferredFormat(PyObject *self, PyObject *a int arg2 = (int) wxDataObject::Get ; SwigValueWrapper< wxDataFormat > result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DataObject_GetPreferredFormat",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DataObject_GetPreferredFormat",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDataObject::Direction) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxDataObject const *)arg1)->GetPreferredFormat((wxDataObject::Direction )arg2); @@ -22378,12 +23632,19 @@ static PyObject *_wrap_DataObject_GetFormatCount(PyObject *self, PyObject *args, int arg2 = (int) wxDataObject::Get ; size_t result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DataObject_GetFormatCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DataObject_GetFormatCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxDataObject::Direction) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (size_t)((wxDataObject const *)arg1)->GetFormatCount((wxDataObject::Direction )arg2); @@ -22391,7 +23652,7 @@ static PyObject *_wrap_DataObject_GetFormatCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22406,16 +23667,23 @@ static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, Py bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "format",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObject_IsSupported",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DataObject_IsSupported",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj2) { + { + arg3 = (wxDataObject::Direction) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxDataObject const *)arg1)->IsSupported((wxDataFormat const &)*arg2,(wxDataObject::Direction )arg3); @@ -22423,7 +23691,7 @@ static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22454,7 +23722,7 @@ static PyObject *_wrap_DataObject_GetDataSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22468,13 +23736,20 @@ static PyObject *_wrap_DataObject_GetAllFormats(PyObject *self, PyObject *args, int arg3 = (int) wxDataObject::Get ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "formats",(char *) "dir", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObject_GetAllFormats",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DataObject_GetAllFormats",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (wxDataObject::Direction) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxDataObject const *)arg1)->GetAllFormats(arg2,(wxDataObject::Direction )arg3); @@ -22516,7 +23791,7 @@ static PyObject *_wrap_DataObject_GetDataHere(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22545,7 +23820,7 @@ static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObje PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -22556,7 +23831,7 @@ static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -22763,13 +24038,20 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P int arg3 = (int) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dataObject",(char *) "preferred", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:DataObjectComposite_Add",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DataObjectComposite_Add",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObjectComposite,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDataObjectSimple,SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Add(arg2,arg3); @@ -22850,7 +24132,7 @@ static PyObject *_wrap_TextDataObject_GetTextLength(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -23356,7 +24638,7 @@ static PyObject *_wrap_CustomDataObject_SetData(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23381,7 +24663,7 @@ static PyObject *_wrap_CustomDataObject_GetSize(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -23612,11 +24894,16 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 ; bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "res", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:IsDragResultOk",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IsDragResultOk",kwnames,&obj0)) goto fail; + { + arg1 = (wxDragResult) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxIsDragResultOk((wxDragResult )arg1); @@ -23624,7 +24911,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -23692,14 +24979,19 @@ static PyObject *_wrap_DropSource__setCallbackInfo(PyObject *self, PyObject *arg PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOi:DropSource__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropSource__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropSource,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->_setCallbackInfo(arg2,arg3,arg4); @@ -23799,13 +25091,18 @@ static PyObject *_wrap_DropSource_SetCursor(PyObject *self, PyObject *args, PyOb int arg2 ; wxCursor *arg3 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "res",(char *) "cursor", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:DropSource_SetCursor",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DropSource_SetCursor",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropSource,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDragResult) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -23830,12 +25127,19 @@ static PyObject *_wrap_DropSource_DoDragDrop(PyObject *self, PyObject *args, PyO int arg2 = (int) wxDrag_CopyOnly ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:DropSource_DoDragDrop",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DropSource_DoDragDrop",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropSource,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->DoDragDrop(arg2); @@ -23843,7 +25147,7 @@ static PyObject *_wrap_DropSource_DoDragDrop(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -23856,12 +25160,17 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *ar int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "effect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DropSource_base_GiveFeedback",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropSource_base_GiveFeedback",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropSource,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDragResult) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_GiveFeedback((wxDragResult )arg2); @@ -23869,7 +25178,7 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24024,12 +25333,27 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, P int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:DropTarget_base_OnEnter",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnEnter(arg2,arg3,(wxDragResult )arg4); @@ -24037,7 +25361,7 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24052,12 +25376,27 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:DropTarget_base_OnDragOver",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnDragOver(arg2,arg3,(wxDragResult )arg4); @@ -24065,7 +25404,7 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24103,12 +25442,22 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, Py int arg3 ; bool 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 *)"Oii:DropTarget_base_OnDrop",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnDrop(arg2,arg3); @@ -24116,7 +25465,7 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24141,7 +25490,7 @@ static PyObject *_wrap_DropTarget_GetData(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24215,12 +25564,27 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *arg int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:TextDropTarget_base_OnEnter",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnEnter(arg2,arg3,(wxDragResult )arg4); @@ -24228,7 +25592,7 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24243,12 +25607,27 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject * int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:TextDropTarget_base_OnDragOver",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnDragOver(arg2,arg3,(wxDragResult )arg4); @@ -24256,7 +25635,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24294,12 +25673,22 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args int arg3 ; bool 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 *)"Oii:TextDropTarget_base_OnDrop",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextDropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnDrop(arg2,arg3); @@ -24307,7 +25696,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24322,12 +25711,27 @@ static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:TextDropTarget_base_OnData",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTextDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnData(arg2,arg3,(wxDragResult )arg4); @@ -24335,7 +25739,7 @@ static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24409,12 +25813,27 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *arg int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:FileDropTarget_base_OnEnter",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnEnter(arg2,arg3,(wxDragResult )arg4); @@ -24422,7 +25841,7 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24437,12 +25856,27 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject * int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:FileDropTarget_base_OnDragOver",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnDragOver(arg2,arg3,(wxDragResult )arg4); @@ -24450,7 +25884,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24488,12 +25922,22 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args int arg3 ; bool 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 *)"Oii:FileDropTarget_base_OnDrop",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FileDropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnDrop(arg2,arg3); @@ -24501,7 +25945,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24516,12 +25960,27 @@ static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args int arg4 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:FileDropTarget_base_OnData",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFileDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (wxDragResult) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->base_OnData(arg2,arg3,(wxDragResult )arg4); @@ -24529,7 +25988,7 @@ static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -24607,7 +26066,7 @@ static PyObject *_wrap_Clipboard_Open(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24656,7 +26115,7 @@ static PyObject *_wrap_Clipboard_IsOpened(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24684,7 +26143,7 @@ static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24712,7 +26171,7 @@ static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24743,7 +26202,7 @@ static PyObject *_wrap_Clipboard_IsSupported(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24774,7 +26233,7 @@ static PyObject *_wrap_Clipboard_GetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24823,7 +26282,7 @@ static PyObject *_wrap_Clipboard_Flush(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -24844,7 +26303,7 @@ static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -24869,7 +26328,7 @@ static PyObject * Clipboard_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TheClipboard_set(PyObject *_val) { +static int _wrap_TheClipboard_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TheClipboard is read-only."); return 1; } @@ -24952,7 +26411,7 @@ static PyObject *_wrap_ClipboardLocker___nonzero__(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -26256,12 +27715,12 @@ static swig_type_info _swigt__p_wxLogStderr[] = {{"_p_wxLogStderr", 0, "wxLogStd static swig_type_info _swigt__p_wxLogTextCtrl[] = {{"_p_wxLogTextCtrl", 0, "wxLogTextCtrl *", 0},{"_p_wxLogTextCtrl"},{0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0},{"_p_wxTextCtrl"},{0}}; static swig_type_info _swigt__p_wxBusyCursor[] = {{"_p_wxBusyCursor", 0, "wxBusyCursor *", 0},{"_p_wxBusyCursor"},{0}}; -static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0},{"_p_wxFileDataObject"},{0}}; static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0},{"_p_wxPyBitmapDataObject"},{0}}; static swig_type_info _swigt__p_wxPyTextDataObject[] = {{"_p_wxPyTextDataObject", 0, "wxPyTextDataObject *", 0},{"_p_wxPyTextDataObject"},{0}}; static swig_type_info _swigt__p_wxBitmapDataObject[] = {{"_p_wxBitmapDataObject", 0, "wxBitmapDataObject *", 0},{"_p_wxBitmapDataObject"},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxBitmapDataObject},{0}}; static swig_type_info _swigt__p_wxTextDataObject[] = {{"_p_wxTextDataObject", 0, "wxTextDataObject *", 0},{"_p_wxTextDataObject"},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxTextDataObject},{0}}; static swig_type_info _swigt__p_wxDataObject[] = {{"_p_wxDataObject", 0, "wxDataObject *", 0},{"_p_wxDataObjectSimple", _p_wxDataObjectSimpleTo_p_wxDataObject},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObject},{"_p_wxDataObjectComposite", _p_wxDataObjectCompositeTo_p_wxDataObject},{"_p_wxDataObject"},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObject},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObject},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObject},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObject},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObject},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObject},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObject},{"_p_wxURLDataObject", _p_wxURLDataObjectTo_p_wxDataObject},{0}}; +static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0},{"_p_wxFileDataObject"},{0}}; static swig_type_info _swigt__p_wxCustomDataObject[] = {{"_p_wxCustomDataObject", 0, "wxCustomDataObject *", 0},{"_p_wxCustomDataObject"},{0}}; static swig_type_info _swigt__p_wxURLDataObject[] = {{"_p_wxURLDataObject", 0, "wxURLDataObject *", 0},{"_p_wxURLDataObject"},{0}}; static swig_type_info _swigt__p_wxMetafileDataObject[] = {{"_p_wxMetafileDataObject", 0, "wxMetafileDataObject *", 0},{"_p_wxMetafileDataObject"},{0}}; @@ -26278,6 +27737,7 @@ static swig_type_info _swigt__p_wxPyDataObjectSimple[] = {{"_p_wxPyDataObjectSim static swig_type_info _swigt__p_wxDataObjectSimple[] = {{"_p_wxDataObjectSimple", 0, "wxDataObjectSimple *", 0},{"_p_wxDataObjectSimple"},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObjectSimple},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObjectSimple},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObjectSimple},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObjectSimple},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObjectSimple},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObjectSimple},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObjectSimple},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObjectSimple},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxSingleInstanceChecker[] = {{"_p_wxSingleInstanceChecker", 0, "wxSingleInstanceChecker *", 0},{"_p_wxSingleInstanceChecker"},{0}}; static swig_type_info _swigt__p_wxFileTypeInfo[] = {{"_p_wxFileTypeInfo", 0, "wxFileTypeInfo *", 0},{"_p_wxFileTypeInfo"},{0}}; static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxFrame"},{0}}; @@ -26341,12 +27801,12 @@ _swigt__p_wxLogStderr, _swigt__p_wxLogTextCtrl, _swigt__p_wxTextCtrl, _swigt__p_wxBusyCursor, -_swigt__p_wxFileDataObject, _swigt__p_wxPyBitmapDataObject, _swigt__p_wxPyTextDataObject, _swigt__p_wxBitmapDataObject, _swigt__p_wxTextDataObject, _swigt__p_wxDataObject, +_swigt__p_wxFileDataObject, _swigt__p_wxCustomDataObject, _swigt__p_wxURLDataObject, _swigt__p_wxMetafileDataObject, @@ -26363,6 +27823,7 @@ _swigt__p_wxPyDataObjectSimple, _swigt__p_wxDataObjectSimple, _swigt__p_wxEvtHandler, _swigt__p_wxRect, +_swigt__p_char, _swigt__p_wxSingleInstanceChecker, _swigt__p_wxFileTypeInfo, _swigt__p_wxFrame, @@ -26404,364 +27865,11 @@ _swigt__p_wxDateSpan, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"SYS_OEM_FIXED_FONT", (long) wxSYS_OEM_FIXED_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ANSI_FIXED_FONT", (long) wxSYS_ANSI_FIXED_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ANSI_VAR_FONT", (long) wxSYS_ANSI_VAR_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SYSTEM_FONT", (long) wxSYS_SYSTEM_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DEVICE_DEFAULT_FONT", (long) wxSYS_DEVICE_DEFAULT_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DEFAULT_PALETTE", (long) wxSYS_DEFAULT_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SYSTEM_FIXED_FONT", (long) wxSYS_SYSTEM_FIXED_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DEFAULT_GUI_FONT", (long) wxSYS_DEFAULT_GUI_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICONTITLE_FONT", (long) wxSYS_ICONTITLE_FONT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_SCROLLBAR", (long) wxSYS_COLOUR_SCROLLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BACKGROUND", (long) wxSYS_COLOUR_BACKGROUND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_DESKTOP", (long) wxSYS_COLOUR_DESKTOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_ACTIVECAPTION", (long) wxSYS_COLOUR_ACTIVECAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INACTIVECAPTION", (long) wxSYS_COLOUR_INACTIVECAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MENU", (long) wxSYS_COLOUR_MENU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_WINDOW", (long) wxSYS_COLOUR_WINDOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_WINDOWFRAME", (long) wxSYS_COLOUR_WINDOWFRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MENUTEXT", (long) wxSYS_COLOUR_MENUTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_WINDOWTEXT", (long) wxSYS_COLOUR_WINDOWTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_CAPTIONTEXT", (long) wxSYS_COLOUR_CAPTIONTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_ACTIVEBORDER", (long) wxSYS_COLOUR_ACTIVEBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INACTIVEBORDER", (long) wxSYS_COLOUR_INACTIVEBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_APPWORKSPACE", (long) wxSYS_COLOUR_APPWORKSPACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_HIGHLIGHT", (long) wxSYS_COLOUR_HIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_HIGHLIGHTTEXT", (long) wxSYS_COLOUR_HIGHLIGHTTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNFACE", (long) wxSYS_COLOUR_BTNFACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DFACE", (long) wxSYS_COLOUR_3DFACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNSHADOW", (long) wxSYS_COLOUR_BTNSHADOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DSHADOW", (long) wxSYS_COLOUR_3DSHADOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_GRAYTEXT", (long) wxSYS_COLOUR_GRAYTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNTEXT", (long) wxSYS_COLOUR_BTNTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INACTIVECAPTIONTEXT", (long) wxSYS_COLOUR_INACTIVECAPTIONTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNHIGHLIGHT", (long) wxSYS_COLOUR_BTNHIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_BTNHILIGHT", (long) wxSYS_COLOUR_BTNHILIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DHIGHLIGHT", (long) wxSYS_COLOUR_3DHIGHLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DHILIGHT", (long) wxSYS_COLOUR_3DHILIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DDKSHADOW", (long) wxSYS_COLOUR_3DDKSHADOW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_3DLIGHT", (long) wxSYS_COLOUR_3DLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INFOTEXT", (long) wxSYS_COLOUR_INFOTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_INFOBK", (long) wxSYS_COLOUR_INFOBK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_LISTBOX", (long) wxSYS_COLOUR_LISTBOX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_HOTLIGHT", (long) wxSYS_COLOUR_HOTLIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_GRADIENTACTIVECAPTION", (long) wxSYS_COLOUR_GRADIENTACTIVECAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_GRADIENTINACTIVECAPTION", (long) wxSYS_COLOUR_GRADIENTINACTIVECAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MENUHILIGHT", (long) wxSYS_COLOUR_MENUHILIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MENUBAR", (long) wxSYS_COLOUR_MENUBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_COLOUR_MAX", (long) wxSYS_COLOUR_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_MOUSE_BUTTONS", (long) wxSYS_MOUSE_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_BORDER_X", (long) wxSYS_BORDER_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_BORDER_Y", (long) wxSYS_BORDER_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CURSOR_X", (long) wxSYS_CURSOR_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CURSOR_Y", (long) wxSYS_CURSOR_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DCLICK_X", (long) wxSYS_DCLICK_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DCLICK_Y", (long) wxSYS_DCLICK_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DRAG_X", (long) wxSYS_DRAG_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_DRAG_Y", (long) wxSYS_DRAG_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_EDGE_X", (long) wxSYS_EDGE_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_EDGE_Y", (long) wxSYS_EDGE_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_HSCROLL_ARROW_X", (long) wxSYS_HSCROLL_ARROW_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_HSCROLL_ARROW_Y", (long) wxSYS_HSCROLL_ARROW_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_HTHUMB_X", (long) wxSYS_HTHUMB_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICON_X", (long) wxSYS_ICON_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICON_Y", (long) wxSYS_ICON_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICONSPACING_X", (long) wxSYS_ICONSPACING_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_ICONSPACING_Y", (long) wxSYS_ICONSPACING_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_WINDOWMIN_X", (long) wxSYS_WINDOWMIN_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_WINDOWMIN_Y", (long) wxSYS_WINDOWMIN_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_X", (long) wxSYS_SCREEN_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_Y", (long) wxSYS_SCREEN_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_FRAMESIZE_X", (long) wxSYS_FRAMESIZE_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_FRAMESIZE_Y", (long) wxSYS_FRAMESIZE_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SMALLICON_X", (long) wxSYS_SMALLICON_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SMALLICON_Y", (long) wxSYS_SMALLICON_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_HSCROLL_Y", (long) wxSYS_HSCROLL_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_VSCROLL_X", (long) wxSYS_VSCROLL_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_VSCROLL_ARROW_X", (long) wxSYS_VSCROLL_ARROW_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_VSCROLL_ARROW_Y", (long) wxSYS_VSCROLL_ARROW_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_VTHUMB_Y", (long) wxSYS_VTHUMB_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CAPTION_Y", (long) wxSYS_CAPTION_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_MENU_Y", (long) wxSYS_MENU_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_NETWORK_PRESENT", (long) wxSYS_NETWORK_PRESENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_PENWINDOWS_PRESENT", (long) wxSYS_PENWINDOWS_PRESENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SHOW_SOUNDS", (long) wxSYS_SHOW_SOUNDS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SWAP_BUTTONS", (long) wxSYS_SWAP_BUTTONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CAN_DRAW_FRAME_DECORATIONS", (long) wxSYS_CAN_DRAW_FRAME_DECORATIONS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_CAN_ICONIZE_FRAME", (long) wxSYS_CAN_ICONIZE_FRAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_NONE", (long) wxSYS_SCREEN_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_TINY", (long) wxSYS_SCREEN_TINY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_PDA", (long) wxSYS_SCREEN_PDA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_SMALL", (long) wxSYS_SCREEN_SMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SYS_SCREEN_DESKTOP", (long) wxSYS_SCREEN_DESKTOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHUTDOWN_POWEROFF", (long) wxSHUTDOWN_POWEROFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SHUTDOWN_REBOOT", (long) wxSHUTDOWN_REBOOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TIMER_CONTINUOUS", (long) wxTIMER_CONTINUOUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TIMER_ONE_SHOT", (long) wxTIMER_ONE_SHOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TIMER", (long) wxEVT_TIMER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_FatalError", (long) wxLOG_FatalError, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Error", (long) wxLOG_Error, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Warning", (long) wxLOG_Warning, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Message", (long) wxLOG_Message, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Status", (long) wxLOG_Status, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Info", (long) wxLOG_Info, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Debug", (long) wxLOG_Debug, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Trace", (long) wxLOG_Trace, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Progress", (long) wxLOG_Progress, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_User", (long) wxLOG_User, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOG_Max", (long) wxLOG_Max, 0, 0, 0}, { SWIG_PY_STRING, (char*)"TRACE_MemAlloc", 0, 0, (void *)"memalloc", 0}, { SWIG_PY_STRING, (char*)"TRACE_Messages", 0, 0, (void *)"messages", 0}, { SWIG_PY_STRING, (char*)"TRACE_ResAlloc", 0, 0, (void *)"resalloc", 0}, { SWIG_PY_STRING, (char*)"TRACE_RefCount", 0, 0, (void *)"refcount", 0}, { SWIG_PY_STRING, (char*)"TRACE_OleCalls", 0, 0, (void *)"ole", 0}, -{ SWIG_PY_INT, (char *)"TraceMemAlloc", (long) 0x0001, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TraceMessages", (long) 0x0002, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TraceResAlloc", (long) 0x0004, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TraceRefCount", (long) 0x0008, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TraceOleCalls", (long) 0x0100, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PROCESS_DEFAULT", (long) wxPROCESS_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PROCESS_REDIRECT", (long) wxPROCESS_REDIRECT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_OK", (long) wxKILL_OK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_BAD_SIGNAL", (long) wxKILL_BAD_SIGNAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_ACCESS_DENIED", (long) wxKILL_ACCESS_DENIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_NO_PROCESS", (long) wxKILL_NO_PROCESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"KILL_ERROR", (long) wxKILL_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGNONE", (long) wxSIGNONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGHUP", (long) wxSIGHUP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGINT", (long) wxSIGINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGQUIT", (long) wxSIGQUIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGILL", (long) wxSIGILL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGTRAP", (long) wxSIGTRAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGABRT", (long) wxSIGABRT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGIOT", (long) wxSIGIOT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGEMT", (long) wxSIGEMT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGFPE", (long) wxSIGFPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGKILL", (long) wxSIGKILL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGBUS", (long) wxSIGBUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGSEGV", (long) wxSIGSEGV, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGSYS", (long) wxSIGSYS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGPIPE", (long) wxSIGPIPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGALRM", (long) wxSIGALRM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SIGTERM", (long) wxSIGTERM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_END_PROCESS", (long) wxEVT_END_PROCESS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXEC_ASYNC", (long) wxEXEC_ASYNC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXEC_SYNC", (long) wxEXEC_SYNC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXEC_NOHIDE", (long) wxEXEC_NOHIDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"EXEC_MAKE_GROUP_LEADER", (long) wxEXEC_MAKE_GROUP_LEADER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOYSTICK1", (long) wxJOYSTICK1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOYSTICK2", (long) wxJOYSTICK2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON_ANY", (long) wxJOY_BUTTON_ANY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON1", (long) wxJOY_BUTTON1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON2", (long) wxJOY_BUTTON2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON3", (long) wxJOY_BUTTON3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"JOY_BUTTON4", (long) wxJOY_BUTTON4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_JOY_BUTTON_DOWN", (long) wxEVT_JOY_BUTTON_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_JOY_BUTTON_UP", (long) wxEVT_JOY_BUTTON_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_JOY_MOVE", (long) wxEVT_JOY_MOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_JOY_ZMOVE", (long) wxEVT_JOY_ZMOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_STANDARD", (long) wxMAILCAP_STANDARD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_NETSCAPE", (long) wxMAILCAP_NETSCAPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_KDE", (long) wxMAILCAP_KDE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_GNOME", (long) wxMAILCAP_GNOME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"MAILCAP_ALL", (long) wxMAILCAP_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONFIG_USE_LOCAL_FILE", (long) wxCONFIG_USE_LOCAL_FILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONFIG_USE_GLOBAL_FILE", (long) wxCONFIG_USE_GLOBAL_FILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONFIG_USE_RELATIVE_PATH", (long) wxCONFIG_USE_RELATIVE_PATH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONFIG_USE_NO_ESCAPE_CHARACTERS", (long) wxCONFIG_USE_NO_ESCAPE_CHARACTERS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_Unknown", (long) wxConfigBase::Type_Unknown, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_String", (long) wxConfigBase::Type_String, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_Boolean", (long) wxConfigBase::Type_Boolean, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_Integer", (long) wxConfigBase::Type_Integer, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ConfigBase_Type_Float", (long) wxConfigBase::Type_Float, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Local", (long) wxDateTime::Local, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_12", (long) wxDateTime::GMT_12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_11", (long) wxDateTime::GMT_11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_10", (long) wxDateTime::GMT_10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_9", (long) wxDateTime::GMT_9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_8", (long) wxDateTime::GMT_8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_7", (long) wxDateTime::GMT_7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_6", (long) wxDateTime::GMT_6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_5", (long) wxDateTime::GMT_5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_4", (long) wxDateTime::GMT_4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_3", (long) wxDateTime::GMT_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_2", (long) wxDateTime::GMT_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT_1", (long) wxDateTime::GMT_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT0", (long) wxDateTime::GMT0, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT1", (long) wxDateTime::GMT1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT2", (long) wxDateTime::GMT2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT3", (long) wxDateTime::GMT3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT4", (long) wxDateTime::GMT4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT5", (long) wxDateTime::GMT5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT6", (long) wxDateTime::GMT6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT7", (long) wxDateTime::GMT7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT8", (long) wxDateTime::GMT8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT9", (long) wxDateTime::GMT9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT10", (long) wxDateTime::GMT10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT11", (long) wxDateTime::GMT11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_GMT12", (long) wxDateTime::GMT12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_WET", (long) wxDateTime::WET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_WEST", (long) wxDateTime::WEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_CET", (long) wxDateTime::CET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_CEST", (long) wxDateTime::CEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_EET", (long) wxDateTime::EET, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_EEST", (long) wxDateTime::EEST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_MSK", (long) wxDateTime::MSK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_MSD", (long) wxDateTime::MSD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_AST", (long) wxDateTime::AST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_ADT", (long) wxDateTime::ADT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_EST", (long) wxDateTime::EST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_EDT", (long) wxDateTime::EDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_CST", (long) wxDateTime::CST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_CDT", (long) wxDateTime::CDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_MST", (long) wxDateTime::MST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_MDT", (long) wxDateTime::MDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_PST", (long) wxDateTime::PST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_PDT", (long) wxDateTime::PDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_HST", (long) wxDateTime::HST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_AKST", (long) wxDateTime::AKST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_AKDT", (long) wxDateTime::AKDT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_A_WST", (long) wxDateTime::A_WST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_A_CST", (long) wxDateTime::A_CST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_A_EST", (long) wxDateTime::A_EST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_A_ESST", (long) wxDateTime::A_ESST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_UTC", (long) wxDateTime::UTC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gregorian", (long) wxDateTime::Gregorian, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Julian", (long) wxDateTime::Julian, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Unknown", (long) wxDateTime::Gr_Unknown, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Standard", (long) wxDateTime::Gr_Standard, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Alaska", (long) wxDateTime::Gr_Alaska, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Albania", (long) wxDateTime::Gr_Albania, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria", (long) wxDateTime::Gr_Austria, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Brixen", (long) wxDateTime::Gr_Austria_Brixen, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Salzburg", (long) wxDateTime::Gr_Austria_Salzburg, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Tyrol", (long) wxDateTime::Gr_Austria_Tyrol, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Carinthia", (long) wxDateTime::Gr_Austria_Carinthia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Austria_Styria", (long) wxDateTime::Gr_Austria_Styria, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Belgium", (long) wxDateTime::Gr_Belgium, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Bulgaria", (long) wxDateTime::Gr_Bulgaria, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Bulgaria_1", (long) wxDateTime::Gr_Bulgaria_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Bulgaria_2", (long) wxDateTime::Gr_Bulgaria_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Bulgaria_3", (long) wxDateTime::Gr_Bulgaria_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Canada", (long) wxDateTime::Gr_Canada, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_China", (long) wxDateTime::Gr_China, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_China_1", (long) wxDateTime::Gr_China_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_China_2", (long) wxDateTime::Gr_China_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Czechoslovakia", (long) wxDateTime::Gr_Czechoslovakia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Denmark", (long) wxDateTime::Gr_Denmark, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Egypt", (long) wxDateTime::Gr_Egypt, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Estonia", (long) wxDateTime::Gr_Estonia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Finland", (long) wxDateTime::Gr_Finland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_France", (long) wxDateTime::Gr_France, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_France_Alsace", (long) wxDateTime::Gr_France_Alsace, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_France_Lorraine", (long) wxDateTime::Gr_France_Lorraine, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_France_Strasbourg", (long) wxDateTime::Gr_France_Strasbourg, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Germany", (long) wxDateTime::Gr_Germany, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Germany_Catholic", (long) wxDateTime::Gr_Germany_Catholic, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Germany_Prussia", (long) wxDateTime::Gr_Germany_Prussia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Germany_Protestant", (long) wxDateTime::Gr_Germany_Protestant, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_GreatBritain", (long) wxDateTime::Gr_GreatBritain, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Greece", (long) wxDateTime::Gr_Greece, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Hungary", (long) wxDateTime::Gr_Hungary, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Ireland", (long) wxDateTime::Gr_Ireland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Italy", (long) wxDateTime::Gr_Italy, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Japan", (long) wxDateTime::Gr_Japan, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Japan_1", (long) wxDateTime::Gr_Japan_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Japan_2", (long) wxDateTime::Gr_Japan_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Japan_3", (long) wxDateTime::Gr_Japan_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Latvia", (long) wxDateTime::Gr_Latvia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Lithuania", (long) wxDateTime::Gr_Lithuania, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Luxemburg", (long) wxDateTime::Gr_Luxemburg, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands", (long) wxDateTime::Gr_Netherlands, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands_Groningen", (long) wxDateTime::Gr_Netherlands_Groningen, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands_Gelderland", (long) wxDateTime::Gr_Netherlands_Gelderland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands_Utrecht", (long) wxDateTime::Gr_Netherlands_Utrecht, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Netherlands_Friesland", (long) wxDateTime::Gr_Netherlands_Friesland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Norway", (long) wxDateTime::Gr_Norway, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Poland", (long) wxDateTime::Gr_Poland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Portugal", (long) wxDateTime::Gr_Portugal, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Romania", (long) wxDateTime::Gr_Romania, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Russia", (long) wxDateTime::Gr_Russia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Scotland", (long) wxDateTime::Gr_Scotland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Spain", (long) wxDateTime::Gr_Spain, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Sweden", (long) wxDateTime::Gr_Sweden, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Switzerland", (long) wxDateTime::Gr_Switzerland, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Switzerland_Catholic", (long) wxDateTime::Gr_Switzerland_Catholic, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Switzerland_Protestant", (long) wxDateTime::Gr_Switzerland_Protestant, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Turkey", (long) wxDateTime::Gr_Turkey, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_USA", (long) wxDateTime::Gr_USA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Wales", (long) wxDateTime::Gr_Wales, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Gr_Yugoslavia", (long) wxDateTime::Gr_Yugoslavia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_Unknown", (long) wxDateTime::Country_Unknown, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_Default", (long) wxDateTime::Country_Default, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_WesternEurope_Start", (long) wxDateTime::Country_WesternEurope_Start, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_EEC", (long) wxDateTime::Country_EEC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_France", (long) wxDateTime::France, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Germany", (long) wxDateTime::Germany, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_UK", (long) wxDateTime::UK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Country_WesternEurope_End", (long) wxDateTime::Country_WesternEurope_End, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Russia", (long) wxDateTime::Russia, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_USA", (long) wxDateTime::USA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Jan", (long) wxDateTime::Jan, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Feb", (long) wxDateTime::Feb, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Mar", (long) wxDateTime::Mar, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Apr", (long) wxDateTime::Apr, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_May", (long) wxDateTime::May, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Jun", (long) wxDateTime::Jun, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Jul", (long) wxDateTime::Jul, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Aug", (long) wxDateTime::Aug, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Sep", (long) wxDateTime::Sep, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Oct", (long) wxDateTime::Oct, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Nov", (long) wxDateTime::Nov, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Dec", (long) wxDateTime::Dec, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Inv_Month", (long) wxDateTime::Inv_Month, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Sun", (long) wxDateTime::Sun, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Mon", (long) wxDateTime::Mon, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Tue", (long) wxDateTime::Tue, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Wed", (long) wxDateTime::Wed, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Thu", (long) wxDateTime::Thu, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Fri", (long) wxDateTime::Fri, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Sat", (long) wxDateTime::Sat, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Inv_WeekDay", (long) wxDateTime::Inv_WeekDay, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Inv_Year", (long) wxDateTime::Inv_Year, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Name_Full", (long) wxDateTime::Name_Full, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Name_Abbr", (long) wxDateTime::Name_Abbr, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Default_First", (long) wxDateTime::Default_First, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Monday_First", (long) wxDateTime::Monday_First, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DateTime_Sunday_First", (long) wxDateTime::Sunday_First, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_INVALID", (long) wxDF_INVALID, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_TEXT", (long) wxDF_TEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_BITMAP", (long) wxDF_BITMAP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_METAFILE", (long) wxDF_METAFILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_SYLK", (long) wxDF_SYLK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_DIF", (long) wxDF_DIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_TIFF", (long) wxDF_TIFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_OEMTEXT", (long) wxDF_OEMTEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_DIB", (long) wxDF_DIB, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_PALETTE", (long) wxDF_PALETTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_PENDATA", (long) wxDF_PENDATA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_RIFF", (long) wxDF_RIFF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_WAVE", (long) wxDF_WAVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_UNICODETEXT", (long) wxDF_UNICODETEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_ENHMETAFILE", (long) wxDF_ENHMETAFILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_FILENAME", (long) wxDF_FILENAME, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_LOCALE", (long) wxDF_LOCALE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_PRIVATE", (long) wxDF_PRIVATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_HTML", (long) wxDF_HTML, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DF_MAX", (long) wxDF_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DataObject_Get", (long) wxDataObject::Get, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DataObject_Set", (long) wxDataObject::Set, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DataObject_Both", (long) wxDataObject::Both, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Drag_CopyOnly", (long) wxDrag_CopyOnly, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Drag_AllowMove", (long) wxDrag_AllowMove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"Drag_DefaultMove", (long) wxDrag_DefaultMove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragError", (long) wxDragError, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragNone", (long) wxDragNone, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragCopy", (long) wxDragCopy, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragMove", (long) wxDragMove, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragLink", (long) wxDragLink, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"DragCancel", (long) wxDragCancel, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -26788,19 +27896,170 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"SYS_OEM_FIXED_FONT", SWIG_PyObj_FromInt((int)wxSYS_OEM_FIXED_FONT)); + PyDict_SetItemString(d,"SYS_ANSI_FIXED_FONT", SWIG_PyObj_FromInt((int)wxSYS_ANSI_FIXED_FONT)); + PyDict_SetItemString(d,"SYS_ANSI_VAR_FONT", SWIG_PyObj_FromInt((int)wxSYS_ANSI_VAR_FONT)); + PyDict_SetItemString(d,"SYS_SYSTEM_FONT", SWIG_PyObj_FromInt((int)wxSYS_SYSTEM_FONT)); + PyDict_SetItemString(d,"SYS_DEVICE_DEFAULT_FONT", SWIG_PyObj_FromInt((int)wxSYS_DEVICE_DEFAULT_FONT)); + PyDict_SetItemString(d,"SYS_DEFAULT_PALETTE", SWIG_PyObj_FromInt((int)wxSYS_DEFAULT_PALETTE)); + PyDict_SetItemString(d,"SYS_SYSTEM_FIXED_FONT", SWIG_PyObj_FromInt((int)wxSYS_SYSTEM_FIXED_FONT)); + PyDict_SetItemString(d,"SYS_DEFAULT_GUI_FONT", SWIG_PyObj_FromInt((int)wxSYS_DEFAULT_GUI_FONT)); + PyDict_SetItemString(d,"SYS_ICONTITLE_FONT", SWIG_PyObj_FromInt((int)wxSYS_ICONTITLE_FONT)); + PyDict_SetItemString(d,"SYS_COLOUR_SCROLLBAR", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_SCROLLBAR)); + PyDict_SetItemString(d,"SYS_COLOUR_BACKGROUND", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BACKGROUND)); + PyDict_SetItemString(d,"SYS_COLOUR_DESKTOP", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_DESKTOP)); + PyDict_SetItemString(d,"SYS_COLOUR_ACTIVECAPTION", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_ACTIVECAPTION)); + PyDict_SetItemString(d,"SYS_COLOUR_INACTIVECAPTION", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INACTIVECAPTION)); + PyDict_SetItemString(d,"SYS_COLOUR_MENU", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MENU)); + PyDict_SetItemString(d,"SYS_COLOUR_WINDOW", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_WINDOW)); + PyDict_SetItemString(d,"SYS_COLOUR_WINDOWFRAME", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_WINDOWFRAME)); + PyDict_SetItemString(d,"SYS_COLOUR_MENUTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MENUTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_WINDOWTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_WINDOWTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_CAPTIONTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_CAPTIONTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_ACTIVEBORDER", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_ACTIVEBORDER)); + PyDict_SetItemString(d,"SYS_COLOUR_INACTIVEBORDER", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INACTIVEBORDER)); + PyDict_SetItemString(d,"SYS_COLOUR_APPWORKSPACE", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_APPWORKSPACE)); + PyDict_SetItemString(d,"SYS_COLOUR_HIGHLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_HIGHLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_HIGHLIGHTTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_HIGHLIGHTTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNFACE", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNFACE)); + PyDict_SetItemString(d,"SYS_COLOUR_3DFACE", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DFACE)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNSHADOW", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNSHADOW)); + PyDict_SetItemString(d,"SYS_COLOUR_3DSHADOW", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DSHADOW)); + PyDict_SetItemString(d,"SYS_COLOUR_GRAYTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_GRAYTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_INACTIVECAPTIONTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INACTIVECAPTIONTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNHIGHLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNHIGHLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_BTNHILIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_BTNHILIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_3DHIGHLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DHIGHLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_3DHILIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DHILIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_3DDKSHADOW", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DDKSHADOW)); + PyDict_SetItemString(d,"SYS_COLOUR_3DLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_3DLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_INFOTEXT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INFOTEXT)); + PyDict_SetItemString(d,"SYS_COLOUR_INFOBK", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_INFOBK)); + PyDict_SetItemString(d,"SYS_COLOUR_LISTBOX", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_LISTBOX)); + PyDict_SetItemString(d,"SYS_COLOUR_HOTLIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_HOTLIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_GRADIENTACTIVECAPTION", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_GRADIENTACTIVECAPTION)); + PyDict_SetItemString(d,"SYS_COLOUR_GRADIENTINACTIVECAPTION", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_GRADIENTINACTIVECAPTION)); + PyDict_SetItemString(d,"SYS_COLOUR_MENUHILIGHT", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MENUHILIGHT)); + PyDict_SetItemString(d,"SYS_COLOUR_MENUBAR", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MENUBAR)); + PyDict_SetItemString(d,"SYS_COLOUR_MAX", SWIG_PyObj_FromInt((int)wxSYS_COLOUR_MAX)); + PyDict_SetItemString(d,"SYS_MOUSE_BUTTONS", SWIG_PyObj_FromInt((int)wxSYS_MOUSE_BUTTONS)); + PyDict_SetItemString(d,"SYS_BORDER_X", SWIG_PyObj_FromInt((int)wxSYS_BORDER_X)); + PyDict_SetItemString(d,"SYS_BORDER_Y", SWIG_PyObj_FromInt((int)wxSYS_BORDER_Y)); + PyDict_SetItemString(d,"SYS_CURSOR_X", SWIG_PyObj_FromInt((int)wxSYS_CURSOR_X)); + PyDict_SetItemString(d,"SYS_CURSOR_Y", SWIG_PyObj_FromInt((int)wxSYS_CURSOR_Y)); + PyDict_SetItemString(d,"SYS_DCLICK_X", SWIG_PyObj_FromInt((int)wxSYS_DCLICK_X)); + PyDict_SetItemString(d,"SYS_DCLICK_Y", SWIG_PyObj_FromInt((int)wxSYS_DCLICK_Y)); + PyDict_SetItemString(d,"SYS_DRAG_X", SWIG_PyObj_FromInt((int)wxSYS_DRAG_X)); + PyDict_SetItemString(d,"SYS_DRAG_Y", SWIG_PyObj_FromInt((int)wxSYS_DRAG_Y)); + PyDict_SetItemString(d,"SYS_EDGE_X", SWIG_PyObj_FromInt((int)wxSYS_EDGE_X)); + PyDict_SetItemString(d,"SYS_EDGE_Y", SWIG_PyObj_FromInt((int)wxSYS_EDGE_Y)); + PyDict_SetItemString(d,"SYS_HSCROLL_ARROW_X", SWIG_PyObj_FromInt((int)wxSYS_HSCROLL_ARROW_X)); + PyDict_SetItemString(d,"SYS_HSCROLL_ARROW_Y", SWIG_PyObj_FromInt((int)wxSYS_HSCROLL_ARROW_Y)); + PyDict_SetItemString(d,"SYS_HTHUMB_X", SWIG_PyObj_FromInt((int)wxSYS_HTHUMB_X)); + PyDict_SetItemString(d,"SYS_ICON_X", SWIG_PyObj_FromInt((int)wxSYS_ICON_X)); + PyDict_SetItemString(d,"SYS_ICON_Y", SWIG_PyObj_FromInt((int)wxSYS_ICON_Y)); + PyDict_SetItemString(d,"SYS_ICONSPACING_X", SWIG_PyObj_FromInt((int)wxSYS_ICONSPACING_X)); + PyDict_SetItemString(d,"SYS_ICONSPACING_Y", SWIG_PyObj_FromInt((int)wxSYS_ICONSPACING_Y)); + PyDict_SetItemString(d,"SYS_WINDOWMIN_X", SWIG_PyObj_FromInt((int)wxSYS_WINDOWMIN_X)); + PyDict_SetItemString(d,"SYS_WINDOWMIN_Y", SWIG_PyObj_FromInt((int)wxSYS_WINDOWMIN_Y)); + PyDict_SetItemString(d,"SYS_SCREEN_X", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_X)); + PyDict_SetItemString(d,"SYS_SCREEN_Y", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_Y)); + PyDict_SetItemString(d,"SYS_FRAMESIZE_X", SWIG_PyObj_FromInt((int)wxSYS_FRAMESIZE_X)); + PyDict_SetItemString(d,"SYS_FRAMESIZE_Y", SWIG_PyObj_FromInt((int)wxSYS_FRAMESIZE_Y)); + PyDict_SetItemString(d,"SYS_SMALLICON_X", SWIG_PyObj_FromInt((int)wxSYS_SMALLICON_X)); + PyDict_SetItemString(d,"SYS_SMALLICON_Y", SWIG_PyObj_FromInt((int)wxSYS_SMALLICON_Y)); + PyDict_SetItemString(d,"SYS_HSCROLL_Y", SWIG_PyObj_FromInt((int)wxSYS_HSCROLL_Y)); + PyDict_SetItemString(d,"SYS_VSCROLL_X", SWIG_PyObj_FromInt((int)wxSYS_VSCROLL_X)); + PyDict_SetItemString(d,"SYS_VSCROLL_ARROW_X", SWIG_PyObj_FromInt((int)wxSYS_VSCROLL_ARROW_X)); + PyDict_SetItemString(d,"SYS_VSCROLL_ARROW_Y", SWIG_PyObj_FromInt((int)wxSYS_VSCROLL_ARROW_Y)); + PyDict_SetItemString(d,"SYS_VTHUMB_Y", SWIG_PyObj_FromInt((int)wxSYS_VTHUMB_Y)); + PyDict_SetItemString(d,"SYS_CAPTION_Y", SWIG_PyObj_FromInt((int)wxSYS_CAPTION_Y)); + PyDict_SetItemString(d,"SYS_MENU_Y", SWIG_PyObj_FromInt((int)wxSYS_MENU_Y)); + PyDict_SetItemString(d,"SYS_NETWORK_PRESENT", SWIG_PyObj_FromInt((int)wxSYS_NETWORK_PRESENT)); + PyDict_SetItemString(d,"SYS_PENWINDOWS_PRESENT", SWIG_PyObj_FromInt((int)wxSYS_PENWINDOWS_PRESENT)); + PyDict_SetItemString(d,"SYS_SHOW_SOUNDS", SWIG_PyObj_FromInt((int)wxSYS_SHOW_SOUNDS)); + PyDict_SetItemString(d,"SYS_SWAP_BUTTONS", SWIG_PyObj_FromInt((int)wxSYS_SWAP_BUTTONS)); + PyDict_SetItemString(d,"SYS_CAN_DRAW_FRAME_DECORATIONS", SWIG_PyObj_FromInt((int)wxSYS_CAN_DRAW_FRAME_DECORATIONS)); + PyDict_SetItemString(d,"SYS_CAN_ICONIZE_FRAME", SWIG_PyObj_FromInt((int)wxSYS_CAN_ICONIZE_FRAME)); + PyDict_SetItemString(d,"SYS_SCREEN_NONE", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_NONE)); + PyDict_SetItemString(d,"SYS_SCREEN_TINY", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_TINY)); + PyDict_SetItemString(d,"SYS_SCREEN_PDA", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_PDA)); + PyDict_SetItemString(d,"SYS_SCREEN_SMALL", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_SMALL)); + PyDict_SetItemString(d,"SYS_SCREEN_DESKTOP", SWIG_PyObj_FromInt((int)wxSYS_SCREEN_DESKTOP)); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorPromptStr",_wrap_FileSelectorPromptStr_get, _wrap_FileSelectorPromptStr_set); SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set); SWIG_addvarlink(SWIG_globals,(char*)"DirSelectorPromptStr",_wrap_DirSelectorPromptStr_get, _wrap_DirSelectorPromptStr_set); + PyDict_SetItemString(d,"SHUTDOWN_POWEROFF", SWIG_PyObj_FromInt((int)wxSHUTDOWN_POWEROFF)); + PyDict_SetItemString(d,"SHUTDOWN_REBOOT", SWIG_PyObj_FromInt((int)wxSHUTDOWN_REBOOT)); + PyDict_SetItemString(d,"TIMER_CONTINUOUS", SWIG_PyObj_FromInt((int)wxTIMER_CONTINUOUS)); + PyDict_SetItemString(d,"TIMER_ONE_SHOT", SWIG_PyObj_FromInt((int)wxTIMER_ONE_SHOT)); PyDict_SetItemString(d, "wxEVT_TIMER", PyInt_FromLong(wxEVT_TIMER)); + PyDict_SetItemString(d,"LOG_FatalError", SWIG_PyObj_FromInt((int)wxLOG_FatalError)); + PyDict_SetItemString(d,"LOG_Error", SWIG_PyObj_FromInt((int)wxLOG_Error)); + PyDict_SetItemString(d,"LOG_Warning", SWIG_PyObj_FromInt((int)wxLOG_Warning)); + PyDict_SetItemString(d,"LOG_Message", SWIG_PyObj_FromInt((int)wxLOG_Message)); + PyDict_SetItemString(d,"LOG_Status", SWIG_PyObj_FromInt((int)wxLOG_Status)); + PyDict_SetItemString(d,"LOG_Info", SWIG_PyObj_FromInt((int)wxLOG_Info)); + PyDict_SetItemString(d,"LOG_Debug", SWIG_PyObj_FromInt((int)wxLOG_Debug)); + PyDict_SetItemString(d,"LOG_Trace", SWIG_PyObj_FromInt((int)wxLOG_Trace)); + PyDict_SetItemString(d,"LOG_Progress", SWIG_PyObj_FromInt((int)wxLOG_Progress)); + PyDict_SetItemString(d,"LOG_User", SWIG_PyObj_FromInt((int)wxLOG_User)); + PyDict_SetItemString(d,"LOG_Max", SWIG_PyObj_FromInt((int)wxLOG_Max)); + PyDict_SetItemString(d,"TraceMemAlloc", SWIG_PyObj_FromInt((int)0x0001)); + PyDict_SetItemString(d,"TraceMessages", SWIG_PyObj_FromInt((int)0x0002)); + PyDict_SetItemString(d,"TraceResAlloc", SWIG_PyObj_FromInt((int)0x0004)); + PyDict_SetItemString(d,"TraceRefCount", SWIG_PyObj_FromInt((int)0x0008)); + PyDict_SetItemString(d,"TraceOleCalls", SWIG_PyObj_FromInt((int)0x0100)); + PyDict_SetItemString(d,"PROCESS_DEFAULT", SWIG_PyObj_FromInt((int)wxPROCESS_DEFAULT)); + PyDict_SetItemString(d,"PROCESS_REDIRECT", SWIG_PyObj_FromInt((int)wxPROCESS_REDIRECT)); + PyDict_SetItemString(d,"KILL_OK", SWIG_PyObj_FromInt((int)wxKILL_OK)); + PyDict_SetItemString(d,"KILL_BAD_SIGNAL", SWIG_PyObj_FromInt((int)wxKILL_BAD_SIGNAL)); + PyDict_SetItemString(d,"KILL_ACCESS_DENIED", SWIG_PyObj_FromInt((int)wxKILL_ACCESS_DENIED)); + PyDict_SetItemString(d,"KILL_NO_PROCESS", SWIG_PyObj_FromInt((int)wxKILL_NO_PROCESS)); + PyDict_SetItemString(d,"KILL_ERROR", SWIG_PyObj_FromInt((int)wxKILL_ERROR)); + PyDict_SetItemString(d,"SIGNONE", SWIG_PyObj_FromInt((int)wxSIGNONE)); + PyDict_SetItemString(d,"SIGHUP", SWIG_PyObj_FromInt((int)wxSIGHUP)); + PyDict_SetItemString(d,"SIGINT", SWIG_PyObj_FromInt((int)wxSIGINT)); + PyDict_SetItemString(d,"SIGQUIT", SWIG_PyObj_FromInt((int)wxSIGQUIT)); + PyDict_SetItemString(d,"SIGILL", SWIG_PyObj_FromInt((int)wxSIGILL)); + PyDict_SetItemString(d,"SIGTRAP", SWIG_PyObj_FromInt((int)wxSIGTRAP)); + PyDict_SetItemString(d,"SIGABRT", SWIG_PyObj_FromInt((int)wxSIGABRT)); + PyDict_SetItemString(d,"SIGIOT", SWIG_PyObj_FromInt((int)wxSIGIOT)); + PyDict_SetItemString(d,"SIGEMT", SWIG_PyObj_FromInt((int)wxSIGEMT)); + PyDict_SetItemString(d,"SIGFPE", SWIG_PyObj_FromInt((int)wxSIGFPE)); + PyDict_SetItemString(d,"SIGKILL", SWIG_PyObj_FromInt((int)wxSIGKILL)); + PyDict_SetItemString(d,"SIGBUS", SWIG_PyObj_FromInt((int)wxSIGBUS)); + PyDict_SetItemString(d,"SIGSEGV", SWIG_PyObj_FromInt((int)wxSIGSEGV)); + PyDict_SetItemString(d,"SIGSYS", SWIG_PyObj_FromInt((int)wxSIGSYS)); + PyDict_SetItemString(d,"SIGPIPE", SWIG_PyObj_FromInt((int)wxSIGPIPE)); + PyDict_SetItemString(d,"SIGALRM", SWIG_PyObj_FromInt((int)wxSIGALRM)); + PyDict_SetItemString(d,"SIGTERM", SWIG_PyObj_FromInt((int)wxSIGTERM)); PyDict_SetItemString(d, "wxEVT_END_PROCESS", PyInt_FromLong(wxEVT_END_PROCESS)); + PyDict_SetItemString(d,"EXEC_ASYNC", SWIG_PyObj_FromInt((int)wxEXEC_ASYNC)); + PyDict_SetItemString(d,"EXEC_SYNC", SWIG_PyObj_FromInt((int)wxEXEC_SYNC)); + PyDict_SetItemString(d,"EXEC_NOHIDE", SWIG_PyObj_FromInt((int)wxEXEC_NOHIDE)); + PyDict_SetItemString(d,"EXEC_MAKE_GROUP_LEADER", SWIG_PyObj_FromInt((int)wxEXEC_MAKE_GROUP_LEADER)); wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess"); + PyDict_SetItemString(d,"JOYSTICK1", SWIG_PyObj_FromInt((int)wxJOYSTICK1)); + PyDict_SetItemString(d,"JOYSTICK2", SWIG_PyObj_FromInt((int)wxJOYSTICK2)); + PyDict_SetItemString(d,"JOY_BUTTON_ANY", SWIG_PyObj_FromInt((int)wxJOY_BUTTON_ANY)); + PyDict_SetItemString(d,"JOY_BUTTON1", SWIG_PyObj_FromInt((int)wxJOY_BUTTON1)); + PyDict_SetItemString(d,"JOY_BUTTON2", SWIG_PyObj_FromInt((int)wxJOY_BUTTON2)); + PyDict_SetItemString(d,"JOY_BUTTON3", SWIG_PyObj_FromInt((int)wxJOY_BUTTON3)); + PyDict_SetItemString(d,"JOY_BUTTON4", SWIG_PyObj_FromInt((int)wxJOY_BUTTON4)); PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_DOWN", PyInt_FromLong(wxEVT_JOY_BUTTON_DOWN)); PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_UP", PyInt_FromLong(wxEVT_JOY_BUTTON_UP)); PyDict_SetItemString(d, "wxEVT_JOY_MOVE", PyInt_FromLong(wxEVT_JOY_MOVE)); PyDict_SetItemString(d, "wxEVT_JOY_ZMOVE", PyInt_FromLong(wxEVT_JOY_ZMOVE)); + PyDict_SetItemString(d,"MAILCAP_STANDARD", SWIG_PyObj_FromInt((int)wxMAILCAP_STANDARD)); + PyDict_SetItemString(d,"MAILCAP_NETSCAPE", SWIG_PyObj_FromInt((int)wxMAILCAP_NETSCAPE)); + PyDict_SetItemString(d,"MAILCAP_KDE", SWIG_PyObj_FromInt((int)wxMAILCAP_KDE)); + PyDict_SetItemString(d,"MAILCAP_GNOME", SWIG_PyObj_FromInt((int)wxMAILCAP_GNOME)); + PyDict_SetItemString(d,"MAILCAP_ALL", SWIG_PyObj_FromInt((int)wxMAILCAP_ALL)); SWIG_addvarlink(SWIG_globals,(char*)"TheMimeTypesManager",_wrap_TheMimeTypesManager_get, _wrap_TheMimeTypesManager_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_TOOLBAR",_wrap_ART_TOOLBAR_get, _wrap_ART_TOOLBAR_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_MENU",_wrap_ART_MENU_get, _wrap_ART_MENU_set); @@ -26843,9 +28102,205 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider"); + PyDict_SetItemString(d,"CONFIG_USE_LOCAL_FILE", SWIG_PyObj_FromInt((int)wxCONFIG_USE_LOCAL_FILE)); + PyDict_SetItemString(d,"CONFIG_USE_GLOBAL_FILE", SWIG_PyObj_FromInt((int)wxCONFIG_USE_GLOBAL_FILE)); + PyDict_SetItemString(d,"CONFIG_USE_RELATIVE_PATH", SWIG_PyObj_FromInt((int)wxCONFIG_USE_RELATIVE_PATH)); + PyDict_SetItemString(d,"CONFIG_USE_NO_ESCAPE_CHARACTERS", SWIG_PyObj_FromInt((int)wxCONFIG_USE_NO_ESCAPE_CHARACTERS)); + PyDict_SetItemString(d,"ConfigBase_Type_Unknown", SWIG_PyObj_FromInt((int)wxConfigBase::Type_Unknown)); + PyDict_SetItemString(d,"ConfigBase_Type_String", SWIG_PyObj_FromInt((int)wxConfigBase::Type_String)); + PyDict_SetItemString(d,"ConfigBase_Type_Boolean", SWIG_PyObj_FromInt((int)wxConfigBase::Type_Boolean)); + PyDict_SetItemString(d,"ConfigBase_Type_Integer", SWIG_PyObj_FromInt((int)wxConfigBase::Type_Integer)); + PyDict_SetItemString(d,"ConfigBase_Type_Float", SWIG_PyObj_FromInt((int)wxConfigBase::Type_Float)); SWIG_addvarlink(SWIG_globals,(char*)"DateFormatStr",_wrap_DateFormatStr_get, _wrap_DateFormatStr_set); SWIG_addvarlink(SWIG_globals,(char*)"TimeSpanFormatStr",_wrap_TimeSpanFormatStr_get, _wrap_TimeSpanFormatStr_set); + PyDict_SetItemString(d,"DateTime_Local", SWIG_PyObj_FromInt((int)wxDateTime::Local)); + PyDict_SetItemString(d,"DateTime_GMT_12", SWIG_PyObj_FromInt((int)wxDateTime::GMT_12)); + PyDict_SetItemString(d,"DateTime_GMT_11", SWIG_PyObj_FromInt((int)wxDateTime::GMT_11)); + PyDict_SetItemString(d,"DateTime_GMT_10", SWIG_PyObj_FromInt((int)wxDateTime::GMT_10)); + PyDict_SetItemString(d,"DateTime_GMT_9", SWIG_PyObj_FromInt((int)wxDateTime::GMT_9)); + PyDict_SetItemString(d,"DateTime_GMT_8", SWIG_PyObj_FromInt((int)wxDateTime::GMT_8)); + PyDict_SetItemString(d,"DateTime_GMT_7", SWIG_PyObj_FromInt((int)wxDateTime::GMT_7)); + PyDict_SetItemString(d,"DateTime_GMT_6", SWIG_PyObj_FromInt((int)wxDateTime::GMT_6)); + PyDict_SetItemString(d,"DateTime_GMT_5", SWIG_PyObj_FromInt((int)wxDateTime::GMT_5)); + PyDict_SetItemString(d,"DateTime_GMT_4", SWIG_PyObj_FromInt((int)wxDateTime::GMT_4)); + PyDict_SetItemString(d,"DateTime_GMT_3", SWIG_PyObj_FromInt((int)wxDateTime::GMT_3)); + PyDict_SetItemString(d,"DateTime_GMT_2", SWIG_PyObj_FromInt((int)wxDateTime::GMT_2)); + PyDict_SetItemString(d,"DateTime_GMT_1", SWIG_PyObj_FromInt((int)wxDateTime::GMT_1)); + PyDict_SetItemString(d,"DateTime_GMT0", SWIG_PyObj_FromInt((int)wxDateTime::GMT0)); + PyDict_SetItemString(d,"DateTime_GMT1", SWIG_PyObj_FromInt((int)wxDateTime::GMT1)); + PyDict_SetItemString(d,"DateTime_GMT2", SWIG_PyObj_FromInt((int)wxDateTime::GMT2)); + PyDict_SetItemString(d,"DateTime_GMT3", SWIG_PyObj_FromInt((int)wxDateTime::GMT3)); + PyDict_SetItemString(d,"DateTime_GMT4", SWIG_PyObj_FromInt((int)wxDateTime::GMT4)); + PyDict_SetItemString(d,"DateTime_GMT5", SWIG_PyObj_FromInt((int)wxDateTime::GMT5)); + PyDict_SetItemString(d,"DateTime_GMT6", SWIG_PyObj_FromInt((int)wxDateTime::GMT6)); + PyDict_SetItemString(d,"DateTime_GMT7", SWIG_PyObj_FromInt((int)wxDateTime::GMT7)); + PyDict_SetItemString(d,"DateTime_GMT8", SWIG_PyObj_FromInt((int)wxDateTime::GMT8)); + PyDict_SetItemString(d,"DateTime_GMT9", SWIG_PyObj_FromInt((int)wxDateTime::GMT9)); + PyDict_SetItemString(d,"DateTime_GMT10", SWIG_PyObj_FromInt((int)wxDateTime::GMT10)); + PyDict_SetItemString(d,"DateTime_GMT11", SWIG_PyObj_FromInt((int)wxDateTime::GMT11)); + PyDict_SetItemString(d,"DateTime_GMT12", SWIG_PyObj_FromInt((int)wxDateTime::GMT12)); + PyDict_SetItemString(d,"DateTime_WET", SWIG_PyObj_FromInt((int)wxDateTime::WET)); + PyDict_SetItemString(d,"DateTime_WEST", SWIG_PyObj_FromInt((int)wxDateTime::WEST)); + PyDict_SetItemString(d,"DateTime_CET", SWIG_PyObj_FromInt((int)wxDateTime::CET)); + PyDict_SetItemString(d,"DateTime_CEST", SWIG_PyObj_FromInt((int)wxDateTime::CEST)); + PyDict_SetItemString(d,"DateTime_EET", SWIG_PyObj_FromInt((int)wxDateTime::EET)); + PyDict_SetItemString(d,"DateTime_EEST", SWIG_PyObj_FromInt((int)wxDateTime::EEST)); + PyDict_SetItemString(d,"DateTime_MSK", SWIG_PyObj_FromInt((int)wxDateTime::MSK)); + PyDict_SetItemString(d,"DateTime_MSD", SWIG_PyObj_FromInt((int)wxDateTime::MSD)); + PyDict_SetItemString(d,"DateTime_AST", SWIG_PyObj_FromInt((int)wxDateTime::AST)); + PyDict_SetItemString(d,"DateTime_ADT", SWIG_PyObj_FromInt((int)wxDateTime::ADT)); + PyDict_SetItemString(d,"DateTime_EST", SWIG_PyObj_FromInt((int)wxDateTime::EST)); + PyDict_SetItemString(d,"DateTime_EDT", SWIG_PyObj_FromInt((int)wxDateTime::EDT)); + PyDict_SetItemString(d,"DateTime_CST", SWIG_PyObj_FromInt((int)wxDateTime::CST)); + PyDict_SetItemString(d,"DateTime_CDT", SWIG_PyObj_FromInt((int)wxDateTime::CDT)); + PyDict_SetItemString(d,"DateTime_MST", SWIG_PyObj_FromInt((int)wxDateTime::MST)); + PyDict_SetItemString(d,"DateTime_MDT", SWIG_PyObj_FromInt((int)wxDateTime::MDT)); + PyDict_SetItemString(d,"DateTime_PST", SWIG_PyObj_FromInt((int)wxDateTime::PST)); + PyDict_SetItemString(d,"DateTime_PDT", SWIG_PyObj_FromInt((int)wxDateTime::PDT)); + PyDict_SetItemString(d,"DateTime_HST", SWIG_PyObj_FromInt((int)wxDateTime::HST)); + PyDict_SetItemString(d,"DateTime_AKST", SWIG_PyObj_FromInt((int)wxDateTime::AKST)); + PyDict_SetItemString(d,"DateTime_AKDT", SWIG_PyObj_FromInt((int)wxDateTime::AKDT)); + PyDict_SetItemString(d,"DateTime_A_WST", SWIG_PyObj_FromInt((int)wxDateTime::A_WST)); + PyDict_SetItemString(d,"DateTime_A_CST", SWIG_PyObj_FromInt((int)wxDateTime::A_CST)); + PyDict_SetItemString(d,"DateTime_A_EST", SWIG_PyObj_FromInt((int)wxDateTime::A_EST)); + PyDict_SetItemString(d,"DateTime_A_ESST", SWIG_PyObj_FromInt((int)wxDateTime::A_ESST)); + PyDict_SetItemString(d,"DateTime_UTC", SWIG_PyObj_FromInt((int)wxDateTime::UTC)); + PyDict_SetItemString(d,"DateTime_Gregorian", SWIG_PyObj_FromInt((int)wxDateTime::Gregorian)); + PyDict_SetItemString(d,"DateTime_Julian", SWIG_PyObj_FromInt((int)wxDateTime::Julian)); + PyDict_SetItemString(d,"DateTime_Gr_Unknown", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Unknown)); + PyDict_SetItemString(d,"DateTime_Gr_Standard", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Standard)); + PyDict_SetItemString(d,"DateTime_Gr_Alaska", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Alaska)); + PyDict_SetItemString(d,"DateTime_Gr_Albania", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Albania)); + PyDict_SetItemString(d,"DateTime_Gr_Austria", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Brixen", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Brixen)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Salzburg", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Salzburg)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Tyrol", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Tyrol)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Carinthia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Carinthia)); + PyDict_SetItemString(d,"DateTime_Gr_Austria_Styria", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Austria_Styria)); + PyDict_SetItemString(d,"DateTime_Gr_Belgium", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Belgium)); + PyDict_SetItemString(d,"DateTime_Gr_Bulgaria", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Bulgaria)); + PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_1", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Bulgaria_1)); + PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_2", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Bulgaria_2)); + PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_3", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Bulgaria_3)); + PyDict_SetItemString(d,"DateTime_Gr_Canada", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Canada)); + PyDict_SetItemString(d,"DateTime_Gr_China", SWIG_PyObj_FromInt((int)wxDateTime::Gr_China)); + PyDict_SetItemString(d,"DateTime_Gr_China_1", SWIG_PyObj_FromInt((int)wxDateTime::Gr_China_1)); + PyDict_SetItemString(d,"DateTime_Gr_China_2", SWIG_PyObj_FromInt((int)wxDateTime::Gr_China_2)); + PyDict_SetItemString(d,"DateTime_Gr_Czechoslovakia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Czechoslovakia)); + PyDict_SetItemString(d,"DateTime_Gr_Denmark", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Denmark)); + PyDict_SetItemString(d,"DateTime_Gr_Egypt", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Egypt)); + PyDict_SetItemString(d,"DateTime_Gr_Estonia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Estonia)); + PyDict_SetItemString(d,"DateTime_Gr_Finland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Finland)); + PyDict_SetItemString(d,"DateTime_Gr_France", SWIG_PyObj_FromInt((int)wxDateTime::Gr_France)); + PyDict_SetItemString(d,"DateTime_Gr_France_Alsace", SWIG_PyObj_FromInt((int)wxDateTime::Gr_France_Alsace)); + PyDict_SetItemString(d,"DateTime_Gr_France_Lorraine", SWIG_PyObj_FromInt((int)wxDateTime::Gr_France_Lorraine)); + PyDict_SetItemString(d,"DateTime_Gr_France_Strasbourg", SWIG_PyObj_FromInt((int)wxDateTime::Gr_France_Strasbourg)); + PyDict_SetItemString(d,"DateTime_Gr_Germany", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Germany)); + PyDict_SetItemString(d,"DateTime_Gr_Germany_Catholic", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Germany_Catholic)); + PyDict_SetItemString(d,"DateTime_Gr_Germany_Prussia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Germany_Prussia)); + PyDict_SetItemString(d,"DateTime_Gr_Germany_Protestant", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Germany_Protestant)); + PyDict_SetItemString(d,"DateTime_Gr_GreatBritain", SWIG_PyObj_FromInt((int)wxDateTime::Gr_GreatBritain)); + PyDict_SetItemString(d,"DateTime_Gr_Greece", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Greece)); + PyDict_SetItemString(d,"DateTime_Gr_Hungary", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Hungary)); + PyDict_SetItemString(d,"DateTime_Gr_Ireland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Ireland)); + PyDict_SetItemString(d,"DateTime_Gr_Italy", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Italy)); + PyDict_SetItemString(d,"DateTime_Gr_Japan", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Japan)); + PyDict_SetItemString(d,"DateTime_Gr_Japan_1", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Japan_1)); + PyDict_SetItemString(d,"DateTime_Gr_Japan_2", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Japan_2)); + PyDict_SetItemString(d,"DateTime_Gr_Japan_3", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Japan_3)); + PyDict_SetItemString(d,"DateTime_Gr_Latvia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Latvia)); + PyDict_SetItemString(d,"DateTime_Gr_Lithuania", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Lithuania)); + PyDict_SetItemString(d,"DateTime_Gr_Luxemburg", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Luxemburg)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Groningen", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands_Groningen)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Gelderland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands_Gelderland)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Utrecht", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands_Utrecht)); + PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Friesland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Netherlands_Friesland)); + PyDict_SetItemString(d,"DateTime_Gr_Norway", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Norway)); + PyDict_SetItemString(d,"DateTime_Gr_Poland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Poland)); + PyDict_SetItemString(d,"DateTime_Gr_Portugal", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Portugal)); + PyDict_SetItemString(d,"DateTime_Gr_Romania", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Romania)); + PyDict_SetItemString(d,"DateTime_Gr_Russia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Russia)); + PyDict_SetItemString(d,"DateTime_Gr_Scotland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Scotland)); + PyDict_SetItemString(d,"DateTime_Gr_Spain", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Spain)); + PyDict_SetItemString(d,"DateTime_Gr_Sweden", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Sweden)); + PyDict_SetItemString(d,"DateTime_Gr_Switzerland", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Switzerland)); + PyDict_SetItemString(d,"DateTime_Gr_Switzerland_Catholic", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Switzerland_Catholic)); + PyDict_SetItemString(d,"DateTime_Gr_Switzerland_Protestant", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Switzerland_Protestant)); + PyDict_SetItemString(d,"DateTime_Gr_Turkey", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Turkey)); + PyDict_SetItemString(d,"DateTime_Gr_USA", SWIG_PyObj_FromInt((int)wxDateTime::Gr_USA)); + PyDict_SetItemString(d,"DateTime_Gr_Wales", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Wales)); + PyDict_SetItemString(d,"DateTime_Gr_Yugoslavia", SWIG_PyObj_FromInt((int)wxDateTime::Gr_Yugoslavia)); + PyDict_SetItemString(d,"DateTime_Country_Unknown", SWIG_PyObj_FromInt((int)wxDateTime::Country_Unknown)); + PyDict_SetItemString(d,"DateTime_Country_Default", SWIG_PyObj_FromInt((int)wxDateTime::Country_Default)); + PyDict_SetItemString(d,"DateTime_Country_WesternEurope_Start", SWIG_PyObj_FromInt((int)wxDateTime::Country_WesternEurope_Start)); + PyDict_SetItemString(d,"DateTime_Country_EEC", SWIG_PyObj_FromInt((int)wxDateTime::Country_EEC)); + PyDict_SetItemString(d,"DateTime_France", SWIG_PyObj_FromInt((int)wxDateTime::France)); + PyDict_SetItemString(d,"DateTime_Germany", SWIG_PyObj_FromInt((int)wxDateTime::Germany)); + PyDict_SetItemString(d,"DateTime_UK", SWIG_PyObj_FromInt((int)wxDateTime::UK)); + PyDict_SetItemString(d,"DateTime_Country_WesternEurope_End", SWIG_PyObj_FromInt((int)wxDateTime::Country_WesternEurope_End)); + PyDict_SetItemString(d,"DateTime_Russia", SWIG_PyObj_FromInt((int)wxDateTime::Russia)); + PyDict_SetItemString(d,"DateTime_USA", SWIG_PyObj_FromInt((int)wxDateTime::USA)); + PyDict_SetItemString(d,"DateTime_Jan", SWIG_PyObj_FromInt((int)wxDateTime::Jan)); + PyDict_SetItemString(d,"DateTime_Feb", SWIG_PyObj_FromInt((int)wxDateTime::Feb)); + PyDict_SetItemString(d,"DateTime_Mar", SWIG_PyObj_FromInt((int)wxDateTime::Mar)); + PyDict_SetItemString(d,"DateTime_Apr", SWIG_PyObj_FromInt((int)wxDateTime::Apr)); + PyDict_SetItemString(d,"DateTime_May", SWIG_PyObj_FromInt((int)wxDateTime::May)); + PyDict_SetItemString(d,"DateTime_Jun", SWIG_PyObj_FromInt((int)wxDateTime::Jun)); + PyDict_SetItemString(d,"DateTime_Jul", SWIG_PyObj_FromInt((int)wxDateTime::Jul)); + PyDict_SetItemString(d,"DateTime_Aug", SWIG_PyObj_FromInt((int)wxDateTime::Aug)); + PyDict_SetItemString(d,"DateTime_Sep", SWIG_PyObj_FromInt((int)wxDateTime::Sep)); + PyDict_SetItemString(d,"DateTime_Oct", SWIG_PyObj_FromInt((int)wxDateTime::Oct)); + PyDict_SetItemString(d,"DateTime_Nov", SWIG_PyObj_FromInt((int)wxDateTime::Nov)); + PyDict_SetItemString(d,"DateTime_Dec", SWIG_PyObj_FromInt((int)wxDateTime::Dec)); + PyDict_SetItemString(d,"DateTime_Inv_Month", SWIG_PyObj_FromInt((int)wxDateTime::Inv_Month)); + PyDict_SetItemString(d,"DateTime_Sun", SWIG_PyObj_FromInt((int)wxDateTime::Sun)); + PyDict_SetItemString(d,"DateTime_Mon", SWIG_PyObj_FromInt((int)wxDateTime::Mon)); + PyDict_SetItemString(d,"DateTime_Tue", SWIG_PyObj_FromInt((int)wxDateTime::Tue)); + PyDict_SetItemString(d,"DateTime_Wed", SWIG_PyObj_FromInt((int)wxDateTime::Wed)); + PyDict_SetItemString(d,"DateTime_Thu", SWIG_PyObj_FromInt((int)wxDateTime::Thu)); + PyDict_SetItemString(d,"DateTime_Fri", SWIG_PyObj_FromInt((int)wxDateTime::Fri)); + PyDict_SetItemString(d,"DateTime_Sat", SWIG_PyObj_FromInt((int)wxDateTime::Sat)); + PyDict_SetItemString(d,"DateTime_Inv_WeekDay", SWIG_PyObj_FromInt((int)wxDateTime::Inv_WeekDay)); + PyDict_SetItemString(d,"DateTime_Inv_Year", SWIG_PyObj_FromInt((int)wxDateTime::Inv_Year)); + PyDict_SetItemString(d,"DateTime_Name_Full", SWIG_PyObj_FromInt((int)wxDateTime::Name_Full)); + PyDict_SetItemString(d,"DateTime_Name_Abbr", SWIG_PyObj_FromInt((int)wxDateTime::Name_Abbr)); + PyDict_SetItemString(d,"DateTime_Default_First", SWIG_PyObj_FromInt((int)wxDateTime::Default_First)); + PyDict_SetItemString(d,"DateTime_Monday_First", SWIG_PyObj_FromInt((int)wxDateTime::Monday_First)); + PyDict_SetItemString(d,"DateTime_Sunday_First", SWIG_PyObj_FromInt((int)wxDateTime::Sunday_First)); + PyDict_SetItemString(d,"DF_INVALID", SWIG_PyObj_FromInt((int)wxDF_INVALID)); + PyDict_SetItemString(d,"DF_TEXT", SWIG_PyObj_FromInt((int)wxDF_TEXT)); + PyDict_SetItemString(d,"DF_BITMAP", SWIG_PyObj_FromInt((int)wxDF_BITMAP)); + PyDict_SetItemString(d,"DF_METAFILE", SWIG_PyObj_FromInt((int)wxDF_METAFILE)); + PyDict_SetItemString(d,"DF_SYLK", SWIG_PyObj_FromInt((int)wxDF_SYLK)); + PyDict_SetItemString(d,"DF_DIF", SWIG_PyObj_FromInt((int)wxDF_DIF)); + PyDict_SetItemString(d,"DF_TIFF", SWIG_PyObj_FromInt((int)wxDF_TIFF)); + PyDict_SetItemString(d,"DF_OEMTEXT", SWIG_PyObj_FromInt((int)wxDF_OEMTEXT)); + PyDict_SetItemString(d,"DF_DIB", SWIG_PyObj_FromInt((int)wxDF_DIB)); + PyDict_SetItemString(d,"DF_PALETTE", SWIG_PyObj_FromInt((int)wxDF_PALETTE)); + PyDict_SetItemString(d,"DF_PENDATA", SWIG_PyObj_FromInt((int)wxDF_PENDATA)); + PyDict_SetItemString(d,"DF_RIFF", SWIG_PyObj_FromInt((int)wxDF_RIFF)); + PyDict_SetItemString(d,"DF_WAVE", SWIG_PyObj_FromInt((int)wxDF_WAVE)); + PyDict_SetItemString(d,"DF_UNICODETEXT", SWIG_PyObj_FromInt((int)wxDF_UNICODETEXT)); + PyDict_SetItemString(d,"DF_ENHMETAFILE", SWIG_PyObj_FromInt((int)wxDF_ENHMETAFILE)); + PyDict_SetItemString(d,"DF_FILENAME", SWIG_PyObj_FromInt((int)wxDF_FILENAME)); + PyDict_SetItemString(d,"DF_LOCALE", SWIG_PyObj_FromInt((int)wxDF_LOCALE)); + PyDict_SetItemString(d,"DF_PRIVATE", SWIG_PyObj_FromInt((int)wxDF_PRIVATE)); + PyDict_SetItemString(d,"DF_HTML", SWIG_PyObj_FromInt((int)wxDF_HTML)); + PyDict_SetItemString(d,"DF_MAX", SWIG_PyObj_FromInt((int)wxDF_MAX)); SWIG_addvarlink(SWIG_globals,(char*)"FormatInvalid",_wrap_FormatInvalid_get, _wrap_FormatInvalid_set); + PyDict_SetItemString(d,"DataObject_Get", SWIG_PyObj_FromInt((int)wxDataObject::Get)); + PyDict_SetItemString(d,"DataObject_Set", SWIG_PyObj_FromInt((int)wxDataObject::Set)); + PyDict_SetItemString(d,"DataObject_Both", SWIG_PyObj_FromInt((int)wxDataObject::Both)); + PyDict_SetItemString(d,"Drag_CopyOnly", SWIG_PyObj_FromInt((int)wxDrag_CopyOnly)); + PyDict_SetItemString(d,"Drag_AllowMove", SWIG_PyObj_FromInt((int)wxDrag_AllowMove)); + PyDict_SetItemString(d,"Drag_DefaultMove", SWIG_PyObj_FromInt((int)wxDrag_DefaultMove)); + PyDict_SetItemString(d,"DragError", SWIG_PyObj_FromInt((int)wxDragError)); + PyDict_SetItemString(d,"DragNone", SWIG_PyObj_FromInt((int)wxDragNone)); + PyDict_SetItemString(d,"DragCopy", SWIG_PyObj_FromInt((int)wxDragCopy)); + PyDict_SetItemString(d,"DragMove", SWIG_PyObj_FromInt((int)wxDragMove)); + PyDict_SetItemString(d,"DragLink", SWIG_PyObj_FromInt((int)wxDragLink)); + PyDict_SetItemString(d,"DragCancel", SWIG_PyObj_FromInt((int)wxDragCancel)); wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource"); wxPyPtrTypeMap_Add("wxDropTarget", "wxPyDropTarget"); diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index e83a98ac13..41aa98e626 100644 --- a/wxPython/src/msw/windows.py +++ b/wxPython/src/msw/windows.py @@ -658,9 +658,10 @@ class SplitterWindow(core.Window): return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, Point point=DefaultPosition, - Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow + __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow """ + if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'] newobj = _windows.new_SplitterWindow(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -669,8 +670,8 @@ class SplitterWindow(core.Window): def Create(*args, **kwargs): """ - Create(Window parent, int id, Point point=DefaultPosition, - Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> bool + Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=SP_3D, String name=SplitterNameStr) -> bool """ return _windows.SplitterWindow_Create(*args, **kwargs) @@ -1597,7 +1598,7 @@ class TaskBarIcon(core.EvtHandler): return _windows.TaskBarIcon_SetIcon(*args, **kwargs) def RemoveIcon(*args, **kwargs): - """RemoveIcon(void ??) -> bool""" + """RemoveIcon() -> bool""" return _windows.TaskBarIcon_RemoveIcon(*args, **kwargs) def PopupMenu(*args, **kwargs): diff --git a/wxPython/src/msw/windows_wrap.cpp b/wxPython/src/msw/windows_wrap.cpp index 10276673d4..bebe72e508 100644 --- a/wxPython/src/msw/windows_wrap.cpp +++ b/wxPython/src/msw/windows_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -421,49 +270,50 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPyHtmlListBox swig_types[37] #define SWIGTYPE_p_wxPyVListBox swig_types[38] #define SWIGTYPE_p_wxRect swig_types[39] -#define SWIGTYPE_p_wxMiniFrame swig_types[40] -#define SWIGTYPE_p_wxFrame swig_types[41] -#define SWIGTYPE_p_wxPyPrintout swig_types[42] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[43] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[44] -#define SWIGTYPE_p_wxStatusBar swig_types[45] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[46] -#define SWIGTYPE_p_wxPoint swig_types[47] -#define SWIGTYPE_p_wxObject swig_types[48] -#define SWIGTYPE_p_unsigned_long swig_types[49] -#define SWIGTYPE_p_wxMDIClientWindow swig_types[50] -#define SWIGTYPE_p_wxTipWindow swig_types[51] -#define SWIGTYPE_p_wxSashLayoutWindow swig_types[52] -#define SWIGTYPE_p_wxSplitterWindow swig_types[53] -#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[54] -#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[55] -#define SWIGTYPE_p_wxPopupWindow swig_types[56] -#define SWIGTYPE_p_wxSashWindow swig_types[57] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[58] -#define SWIGTYPE_p_wxWindow swig_types[59] -#define SWIGTYPE_p_wxScrolledWindow swig_types[60] -#define SWIGTYPE_p_wxSplashScreenWindow swig_types[61] -#define SWIGTYPE_p_wxMenuBar swig_types[62] -#define SWIGTYPE_p_wxPrintPreview swig_types[63] -#define SWIGTYPE_p_wxSashEvent swig_types[64] -#define SWIGTYPE_p_wxString swig_types[65] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[66] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[67] -#define SWIGTYPE_p_wxFontDialog swig_types[68] -#define SWIGTYPE_p_wxDirDialog swig_types[69] -#define SWIGTYPE_p_wxColourDialog swig_types[70] -#define SWIGTYPE_p_wxDialog swig_types[71] -#define SWIGTYPE_p_wxPanel swig_types[72] -#define SWIGTYPE_p_wxPrintDialog swig_types[73] -#define SWIGTYPE_p_wxBitmap swig_types[74] -#define SWIGTYPE_p_wxCommandEvent swig_types[75] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[76] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[77] -#define SWIGTYPE_p_wxColour swig_types[78] -#define SWIGTYPE_p_wxToolBar swig_types[79] -#define SWIGTYPE_p_wxPrintDialogData swig_types[80] +#define SWIGTYPE_p_char swig_types[40] +#define SWIGTYPE_p_wxMiniFrame swig_types[41] +#define SWIGTYPE_p_wxFrame swig_types[42] +#define SWIGTYPE_p_wxPyPrintout swig_types[43] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[44] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[45] +#define SWIGTYPE_p_wxStatusBar swig_types[46] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[47] +#define SWIGTYPE_p_wxPoint swig_types[48] +#define SWIGTYPE_p_wxObject swig_types[49] +#define SWIGTYPE_p_unsigned_long swig_types[50] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[51] +#define SWIGTYPE_p_wxTipWindow swig_types[52] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[53] +#define SWIGTYPE_p_wxSplitterWindow swig_types[54] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[55] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[56] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[57] +#define SWIGTYPE_p_wxPopupWindow swig_types[58] +#define SWIGTYPE_p_wxSashWindow swig_types[59] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[60] +#define SWIGTYPE_p_wxWindow swig_types[61] +#define SWIGTYPE_p_wxScrolledWindow swig_types[62] +#define SWIGTYPE_p_wxMenuBar swig_types[63] +#define SWIGTYPE_p_wxPrintPreview swig_types[64] +#define SWIGTYPE_p_wxSashEvent swig_types[65] +#define SWIGTYPE_p_wxString swig_types[66] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[67] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[68] +#define SWIGTYPE_p_wxFontDialog swig_types[69] +#define SWIGTYPE_p_wxDirDialog swig_types[70] +#define SWIGTYPE_p_wxColourDialog swig_types[71] +#define SWIGTYPE_p_wxDialog swig_types[72] +#define SWIGTYPE_p_wxPanel swig_types[73] +#define SWIGTYPE_p_wxPrintDialog swig_types[74] +#define SWIGTYPE_p_wxBitmap swig_types[75] +#define SWIGTYPE_p_wxCommandEvent swig_types[76] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[77] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[78] +#define SWIGTYPE_p_wxColour swig_types[79] +#define SWIGTYPE_p_wxToolBar swig_types[80] #define SWIGTYPE_p_wxPageSetupDialogData swig_types[81] -static swig_type_info *swig_types[83]; +#define SWIGTYPE_p_wxPrintDialogData swig_types[82] +static swig_type_info *swig_types[84]; /* -------- TYPES TABLE (END) -------- */ @@ -475,6 +325,44 @@ static swig_type_info *swig_types[83]; #define SWIG_name "_windows" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" @@ -484,6 +372,37 @@ static swig_type_info *swig_types[83]; +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -510,6 +429,22 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + static const wxString wxPyFrameNameStr(wxFrameNameStr); static const wxString wxPyDialogNameStr(wxDialogNameStr); static const wxString wxPyStatusLineNameStr(wxStatusLineNameStr); @@ -639,6 +574,14 @@ IMP_PYCALLBACK_VOID_SIZETSIZET_const(wxPyVScrolledWindow, wxVScrolledWindow, OnG IMP_PYCALLBACK_COORD_const (wxPyVScrolledWindow, wxVScrolledWindow, EstimateTotalHeight); +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + #include static const wxString wxPyVListBoxNameStr(wxVListBoxNameStr); @@ -1160,15 +1103,23 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg 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 *)"O|iOOlO:new_Panel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Panel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1181,6 +1132,12 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -1250,16 +1207,22 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Panel_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Panel_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -1272,6 +1235,12 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1286,7 +1255,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -1348,15 +1317,23 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje 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 *)"O|iOOlO:new_ScrolledWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_ScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1369,6 +1346,12 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -1438,16 +1421,24 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:ScrolledWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:ScrolledWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -1460,6 +1451,12 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -1474,7 +1471,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -1500,16 +1497,50 @@ static PyObject *_wrap_ScrolledWindow_SetScrollbars(PyObject *self, PyObject *ar int arg7 = (int) 0 ; bool arg8 = (bool) 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 *) "pixelsPerUnitX",(char *) "pixelsPerUnitY",(char *) "noUnitsX",(char *) "noUnitsY",(char *) "xPos",(char *) "yPos",(char *) "noRefresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|iiO:ScrolledWindow_SetScrollbars",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:ScrolledWindow_SetScrollbars",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { - arg8 = (bool) SPyObj_AsBool(obj7); + arg8 = (bool) SWIG_PyObj_AsBool(obj7); if (PyErr_Occurred()) SWIG_fail; } } @@ -1533,12 +1564,22 @@ static PyObject *_wrap_ScrolledWindow_Scroll(PyObject *self, PyObject *args, PyO int arg2 ; int 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 *)"Oii:ScrolledWindow_Scroll",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_Scroll",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scroll(arg2,arg3); @@ -1559,12 +1600,17 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrolledWindow_GetScrollPageSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrolledWindow_GetScrollPageSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxScrolledWindow const *)arg1)->GetScrollPageSize(arg2); @@ -1572,7 +1618,7 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1585,12 +1631,22 @@ static PyObject *_wrap_ScrolledWindow_SetScrollPageSize(PyObject *self, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient",(char *) "pageSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ScrolledWindow_SetScrollPageSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScrollPageSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScrollPageSize(arg2,arg3); @@ -1611,12 +1667,22 @@ static PyObject *_wrap_ScrolledWindow_SetScrollRate(PyObject *self, PyObject *ar int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xstep",(char *) "ystep", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ScrolledWindow_SetScrollRate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScrollRate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScrollRate(arg2,arg3); @@ -1684,11 +1750,11 @@ static PyObject *_wrap_ScrolledWindow_EnableScrolling(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_EnableScrolling",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -1749,12 +1815,22 @@ static PyObject *_wrap_ScrolledWindow_SetScale(PyObject *self, PyObject *args, P double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xs",(char *) "ys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ScrolledWindow_SetScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScale(arg2,arg3); @@ -1787,7 +1863,7 @@ static PyObject *_wrap_ScrolledWindow_GetScaleX(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1812,7 +1888,7 @@ static PyObject *_wrap_ScrolledWindow_GetScaleY(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1862,11 +1938,21 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(PyObject *sel int temp4 ; int temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTuple(args,(char *)"Oii:ScrolledWindow_CalcScrolledPosition",&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:ScrolledWindow_CalcScrolledPosition",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxScrolledWindow const *)arg1)->CalcScrolledPosition(arg2,arg3,arg4,arg5); @@ -1931,7 +2017,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -1941,7 +2027,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj } if (_v) { { - SPyObj_AsInt(argv[2]); + SWIG_PyObj_AsInt(argv[2]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -2004,11 +2090,21 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(PyObject *s int temp4 ; int temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTuple(args,(char *)"Oii:ScrolledWindow_CalcUnscrolledPosition",&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO:ScrolledWindow_CalcUnscrolledPosition",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); ((wxScrolledWindow const *)arg1)->CalcUnscrolledPosition(arg2,arg3,arg4,arg5); @@ -2073,7 +2169,7 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO } if (_v) { { - SPyObj_AsInt(argv[1]); + SWIG_PyObj_AsInt(argv[1]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -2083,7 +2179,7 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO } if (_v) { { - SPyObj_AsInt(argv[2]); + SWIG_PyObj_AsInt(argv[2]); if (PyErr_Occurred()) { _v = 0; PyErr_Clear(); @@ -2151,7 +2247,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrollInc(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2279,7 +2375,7 @@ static PyObject * ScrolledWindow_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_FrameNameStr_set(PyObject *_val) { +static int _wrap_FrameNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FrameNameStr is read-only."); return 1; } @@ -2299,7 +2395,7 @@ static PyObject *_wrap_FrameNameStr_get() { } -static int _wrap_DialogNameStr_set(PyObject *_val) { +static int _wrap_DialogNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DialogNameStr is read-only."); return 1; } @@ -2319,7 +2415,7 @@ static PyObject *_wrap_DialogNameStr_get() { } -static int _wrap_StatusLineNameStr_set(PyObject *_val) { +static int _wrap_StatusLineNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable StatusLineNameStr is read-only."); return 1; } @@ -2339,7 +2435,7 @@ static PyObject *_wrap_StatusLineNameStr_get() { } -static int _wrap_ToolBarNameStr_set(PyObject *_val) { +static int _wrap_ToolBarNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ToolBarNameStr is read-only."); return 1; } @@ -2373,7 +2469,7 @@ static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -2429,7 +2525,7 @@ static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } } @@ -2465,7 +2561,7 @@ static PyObject *_wrap_TopLevelWindow_IsMaximized(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2490,7 +2586,7 @@ static PyObject *_wrap_TopLevelWindow_IsIconized(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2594,16 +2690,23 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "show",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:TopLevelWindow_ShowFullScreen",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TopLevelWindow_ShowFullScreen",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ShowFullScreen(arg2,arg3); @@ -2611,7 +2714,7 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2636,7 +2739,7 @@ static PyObject *_wrap_TopLevelWindow_IsFullScreen(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2738,7 +2841,7 @@ static PyObject *_wrap_TopLevelWindow_SetShape(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2770,16 +2873,22 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_Frame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_Frame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -2797,6 +2906,12 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -2880,17 +2995,23 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:Frame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:Frame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -2908,6 +3029,12 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -2922,7 +3049,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -3058,12 +3185,17 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Frame_ProcessCommand",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Frame_ProcessCommand",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ProcessCommand(arg2); @@ -3071,7 +3203,7 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3089,13 +3221,34 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyO wxStatusBar *result; bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number",(char *) "style",(char *) "winid",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iliO:Frame_CreateStatusBar",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:Frame_CreateStatusBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = wxString_in_helper(obj4); @@ -3189,17 +3342,24 @@ static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObj bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Frame_SetStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Frame_SetStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStatusText((wxString const &)*arg2,arg3); @@ -3268,17 +3428,24 @@ static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyOb bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Frame_PushStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Frame_PushStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PushStatusText((wxString const &)*arg2,arg3); @@ -3306,12 +3473,19 @@ static PyObject *_wrap_Frame_PopStatusText(PyObject *self, PyObject *args, PyObj wxFrame *arg1 = (wxFrame *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Frame_PopStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Frame_PopStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopStatusText(arg2); @@ -3331,12 +3505,17 @@ static PyObject *_wrap_Frame_SetStatusBarPane(PyObject *self, PyObject *args, Py wxFrame *arg1 = (wxFrame *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Frame_SetStatusBarPane",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Frame_SetStatusBarPane",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStatusBarPane(arg2); @@ -3369,7 +3548,7 @@ static PyObject *_wrap_Frame_GetStatusBarPane(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3386,13 +3565,27 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObj wxToolBar *result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style",(char *) "winid",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|liO:Frame_CreateToolBar",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Frame_CreateToolBar",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -3499,7 +3692,7 @@ static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject temp2 = True; } { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -3578,16 +3771,22 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_Dialog",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_Dialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -3605,6 +3804,12 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -3684,17 +3889,23 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:Dialog_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:Dialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -3712,6 +3923,12 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -3726,7 +3943,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -3754,12 +3971,17 @@ static PyObject *_wrap_Dialog_SetReturnCode(PyObject *self, PyObject *args, PyOb wxDialog *arg1 = (wxDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "returnCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Dialog_SetReturnCode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetReturnCode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetReturnCode(arg2); @@ -3792,7 +4014,7 @@ static PyObject *_wrap_Dialog_GetReturnCode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3848,12 +4070,17 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args, long arg2 ; wxSizer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Dialog_CreateButtonSizer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_CreateButtonSizer",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizer *)(arg1)->CreateButtonSizer(arg2); @@ -3888,7 +4115,7 @@ static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3913,7 +4140,7 @@ static PyObject *_wrap_Dialog_ShowModal(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3925,12 +4152,17 @@ static PyObject *_wrap_Dialog_EndModal(PyObject *self, PyObject *args, PyObject wxDialog *arg1 = (wxDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "retCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Dialog_EndModal",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_EndModal",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EndModal(arg2); @@ -3963,7 +4195,7 @@ static PyObject *_wrap_Dialog_IsModalShowing(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3995,16 +4227,22 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MiniFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MiniFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -4022,6 +4260,12 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -4101,17 +4345,23 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MiniFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MiniFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMiniFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -4129,6 +4379,12 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -4143,7 +4399,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -4188,18 +4444,24 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py wxSize temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "bitmap",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOl:new_SplashScreenWindow",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:new_SplashScreenWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -4212,6 +4474,12 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSplashScreenWindow *)new wxSplashScreenWindow((wxBitmap const &)*arg1,arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6); @@ -4307,19 +4575,35 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject wxPoint temp6 ; wxSize temp7 ; 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 *) "bitmap",(char *) "splashStyle",(char *) "milliseconds",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OliOi|OOl:new_SplashScreen",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5,&obj5,&obj6,&arg8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:new_SplashScreen",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { arg6 = &temp6; @@ -4332,6 +4616,12 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj6, &arg7)) SWIG_fail; } } + if (obj7) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSplashScreen *)new wxSplashScreen((wxBitmap const &)*arg1,arg2,arg3,arg4,arg5,(wxPoint const &)*arg6,(wxSize const &)*arg7,arg8); @@ -4364,7 +4654,7 @@ static PyObject *_wrap_SplashScreen_GetSplashStyle(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4414,7 +4704,7 @@ static PyObject *_wrap_SplashScreen_GetTimeout(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4438,13 +4728,27 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k wxStatusBar *result; bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ilO:new_StatusBar",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_StatusBar",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -4512,14 +4816,26 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|lO:StatusBar_Create",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:StatusBar_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = wxString_in_helper(obj4); @@ -4534,7 +4850,7 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp5) delete arg5; @@ -4554,12 +4870,19 @@ static PyObject *_wrap_StatusBar_SetFieldsCount(PyObject *self, PyObject *args, wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 = (int) 1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_SetFieldsCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_SetFieldsCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFieldsCount(arg2); @@ -4592,7 +4915,7 @@ static PyObject *_wrap_StatusBar_GetFieldsCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4607,17 +4930,24 @@ static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, P bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:StatusBar_SetStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StatusBar_SetStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStatusText((wxString const &)*arg2,arg3); @@ -4646,12 +4976,19 @@ static PyObject *_wrap_StatusBar_GetStatusText(PyObject *self, PyObject *args, P int arg2 = (int) 0 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_GetStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_GetStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxStatusBar const *)arg1)->GetStatusText(arg2); @@ -4680,17 +5017,24 @@ static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args, bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:StatusBar_PushStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StatusBar_PushStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PushStatusText((wxString const &)*arg2,arg3); @@ -4718,12 +5062,19 @@ static PyObject *_wrap_StatusBar_PopStatusText(PyObject *self, PyObject *args, P wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_PopStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_PopStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopStatusText(arg2); @@ -4782,12 +5133,17 @@ static PyObject *_wrap_StatusBar_GetFieldRect(PyObject *self, PyObject *args, Py int arg2 ; wxRect result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:StatusBar_GetFieldRect",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StatusBar_GetFieldRect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxStatusBar_GetFieldRect(arg1,arg2); @@ -4811,12 +5167,17 @@ static PyObject *_wrap_StatusBar_SetMinHeight(PyObject *self, PyObject *args, Py wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:StatusBar_SetMinHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StatusBar_SetMinHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinHeight(arg2); @@ -4849,7 +5210,7 @@ static PyObject *_wrap_StatusBar_GetBorderX(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4874,7 +5235,7 @@ static PyObject *_wrap_StatusBar_GetBorderY(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4888,7 +5249,7 @@ static PyObject * StatusBar_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_SplitterNameStr_set(PyObject *_val) { +static int _wrap_SplitterNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SplitterNameStr is read-only."); return 1; } @@ -4924,15 +5285,21 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje 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 *) "point",(char *) "size",(char *) "style",(char *) "name", NULL + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_SplitterWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -4945,6 +5312,12 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -5014,16 +5387,22 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "point",(char *) "size",(char *) "style",(char *) "name", NULL + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SplitterWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SplitterWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -5036,6 +5415,12 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -5050,7 +5435,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -5124,12 +5509,17 @@ static PyObject *_wrap_SplitterWindow_SetSplitMode(PyObject *self, PyObject *arg wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetSplitMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetSplitMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSplitMode(arg2); @@ -5162,7 +5552,7 @@ static PyObject *_wrap_SplitterWindow_GetSplitMode(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5206,14 +5596,21 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "window1",(char *) "window2",(char *) "sashPosition", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:SplitterWindow_SplitVertically",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SplitVertically",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SplitVertically(arg2,arg3,arg4); @@ -5221,7 +5618,7 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5238,14 +5635,21 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "window1",(char *) "window2",(char *) "sashPosition", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:SplitterWindow_SplitHorizontally",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SplitHorizontally",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SplitHorizontally(arg2,arg3,arg4); @@ -5253,7 +5657,7 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5283,7 +5687,7 @@ static PyObject *_wrap_SplitterWindow_Unsplit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5314,7 +5718,7 @@ static PyObject *_wrap_SplitterWindow_ReplaceWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5339,7 +5743,7 @@ static PyObject *_wrap_SplitterWindow_IsSplit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5351,12 +5755,17 @@ static PyObject *_wrap_SplitterWindow_SetSashSize(PyObject *self, PyObject *args wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetSashSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetSashSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashSize(arg2); @@ -5376,12 +5785,17 @@ static PyObject *_wrap_SplitterWindow_SetBorderSize(PyObject *self, PyObject *ar wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorderSize(arg2); @@ -5414,7 +5828,7 @@ static PyObject *_wrap_SplitterWindow_GetSashSize(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5439,7 +5853,7 @@ static PyObject *_wrap_SplitterWindow_GetBorderSize(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5452,16 +5866,21 @@ static PyObject *_wrap_SplitterWindow_SetSashPosition(PyObject *self, PyObject * int arg2 ; bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "redraw", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:SplitterWindow_SetSashPosition",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:SplitterWindow_SetSashPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -5497,7 +5916,7 @@ static PyObject *_wrap_SplitterWindow_GetSashPosition(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5509,12 +5928,17 @@ static PyObject *_wrap_SplitterWindow_SetMinimumPaneSize(PyObject *self, PyObjec wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetMinimumPaneSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetMinimumPaneSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumPaneSize(arg2); @@ -5547,7 +5971,7 @@ static PyObject *_wrap_SplitterWindow_GetMinimumPaneSize(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5562,12 +5986,29 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args int arg4 = (int) 5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:SplitterWindow_SashHitTest",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SashHitTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SashHitTest(arg2,arg3,arg4); @@ -5575,7 +6016,7 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5619,7 +6060,7 @@ static PyObject *_wrap_SplitterWindow_SetNeedUpdating(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetNeedUpdating",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -5654,7 +6095,7 @@ static PyObject *_wrap_SplitterWindow_GetNeedUpdating(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -5673,12 +6114,19 @@ static PyObject *_wrap_new_SplitterEvent(PyObject *self, PyObject *args, PyObjec wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxSplitterWindow *arg2 = (wxSplitterWindow *) (wxSplitterWindow *) NULL ; wxSplitterEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "splitter", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_SplitterEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SplitterEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5701,12 +6149,17 @@ static PyObject *_wrap_SplitterEvent_SetSashPosition(PyObject *self, PyObject *a wxSplitterEvent *arg1 = (wxSplitterEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterEvent_SetSashPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterEvent_SetSashPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashPosition(arg2); @@ -5739,7 +6192,7 @@ static PyObject *_wrap_SplitterEvent_GetSashPosition(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5791,7 +6244,7 @@ static PyObject *_wrap_SplitterEvent_GetX(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5816,7 +6269,7 @@ static PyObject *_wrap_SplitterEvent_GetY(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5830,7 +6283,7 @@ static PyObject * SplitterEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_SashNameStr_set(PyObject *_val) { +static int _wrap_SashNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SashNameStr is read-only."); return 1; } @@ -5850,7 +6303,7 @@ static PyObject *_wrap_SashNameStr_get() { } -static int _wrap_SashLayoutNameStr_set(PyObject *_val) { +static int _wrap_SashLayoutNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SashLayoutNameStr is read-only."); return 1; } @@ -5886,15 +6339,21 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject * 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 *)"Oi|OOlO:new_SashWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SashWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -5907,6 +6366,12 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -5976,16 +6441,22 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SashWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SashWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -5998,6 +6469,12 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -6012,7 +6489,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -6033,15 +6510,20 @@ static PyObject *_wrap_SashWindow_SetSashVisible(PyObject *self, PyObject *args, int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge",(char *) "sash", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:SashWindow_SetSashVisible",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashVisible",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6064,12 +6546,17 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args, int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_GetSashVisible",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_GetSashVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxSashWindow const *)arg1)->GetSashVisible((wxSashEdgePosition )arg2); @@ -6077,7 +6564,7 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6090,15 +6577,20 @@ static PyObject *_wrap_SashWindow_SetSashBorder(PyObject *self, PyObject *args, int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:SashWindow_SetSashBorder",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashBorder",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = (bool) SPyObj_AsBool(obj2); + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -6121,12 +6613,17 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_HasBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_HasBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxSashWindow const *)arg1)->HasBorder((wxSashEdgePosition )arg2); @@ -6134,7 +6631,7 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -6147,12 +6644,17 @@ static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args, int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_GetEdgeMargin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_GetEdgeMargin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxSashWindow const *)arg1)->GetEdgeMargin((wxSashEdgePosition )arg2); @@ -6160,7 +6662,7 @@ static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6172,12 +6674,17 @@ static PyObject *_wrap_SashWindow_SetDefaultBorderSize(PyObject *self, PyObject wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetDefaultBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetDefaultBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDefaultBorderSize(arg2); @@ -6210,7 +6717,7 @@ static PyObject *_wrap_SashWindow_GetDefaultBorderSize(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6222,12 +6729,17 @@ static PyObject *_wrap_SashWindow_SetExtraBorderSize(PyObject *self, PyObject *a wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetExtraBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetExtraBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraBorderSize(arg2); @@ -6260,7 +6772,7 @@ static PyObject *_wrap_SashWindow_GetExtraBorderSize(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6272,12 +6784,17 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeX(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMinimumSizeX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMinimumSizeX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumSizeX(arg2); @@ -6297,12 +6814,17 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeY(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMinimumSizeY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMinimumSizeY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumSizeY(arg2); @@ -6335,7 +6857,7 @@ static PyObject *_wrap_SashWindow_GetMinimumSizeX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6360,7 +6882,7 @@ static PyObject *_wrap_SashWindow_GetMinimumSizeY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6372,12 +6894,17 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeX(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMaximumSizeX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMaximumSizeX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaximumSizeX(arg2); @@ -6397,12 +6924,17 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeY(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMaximumSizeY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMaximumSizeY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaximumSizeY(arg2); @@ -6435,7 +6967,7 @@ static PyObject *_wrap_SashWindow_GetMaximumSizeX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6460,7 +6992,7 @@ static PyObject *_wrap_SashWindow_GetMaximumSizeY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6475,12 +7007,29 @@ static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, Py int arg4 = (int) 2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:SashWindow_SashHitTest",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SashWindow_SashHitTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->SashHitTest(arg2,arg3,arg4); @@ -6488,7 +7037,7 @@ static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6531,11 +7080,25 @@ static PyObject *_wrap_new_SashEvent(PyObject *self, PyObject *args, PyObject *k int arg1 = (int) 0 ; int arg2 = (int) wxSASH_NONE ; wxSashEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SashEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SashEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSashEvent *)new wxSashEvent(arg1,(wxSashEdgePosition )arg2); @@ -6555,12 +7118,17 @@ static PyObject *_wrap_SashEvent_SetEdge(PyObject *self, PyObject *args, PyObjec wxSashEvent *arg1 = (wxSashEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashEvent_SetEdge",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashEvent_SetEdge",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEdge((wxSashEdgePosition )arg2); @@ -6593,7 +7161,7 @@ static PyObject *_wrap_SashEvent_GetEdge(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6665,12 +7233,17 @@ static PyObject *_wrap_SashEvent_SetDragStatus(PyObject *self, PyObject *args, P wxSashEvent *arg1 = (wxSashEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "status", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashEvent_SetDragStatus",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashEvent_SetDragStatus",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashDragStatus) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDragStatus((wxSashDragStatus )arg2); @@ -6703,7 +7276,7 @@ static PyObject *_wrap_SashEvent_GetDragStatus(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6721,11 +7294,18 @@ static PyObject *_wrap_new_QueryLayoutInfoEvent(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 = (int) 0 ; wxQueryLayoutInfoEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_QueryLayoutInfoEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryLayoutInfoEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxQueryLayoutInfoEvent *)new wxQueryLayoutInfoEvent(arg1); @@ -6745,12 +7325,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetRequestedLength(PyObject *self, P wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "length", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetRequestedLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetRequestedLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRequestedLength(arg2); @@ -6783,7 +7368,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetRequestedLength(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6795,12 +7380,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject *a wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -6833,7 +7423,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6905,12 +7495,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetOrientation(PyObject *self, PyObj wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutOrientation) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation((wxLayoutOrientation )arg2); @@ -6943,7 +7538,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetOrientation(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6955,12 +7550,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObjec wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutAlignment) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxLayoutAlignment )arg2); @@ -6993,7 +7593,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7011,11 +7611,18 @@ static PyObject *_wrap_new_CalculateLayoutEvent(PyObject *self, PyObject *args, PyObject *resultobj; int arg1 = (int) 0 ; wxCalculateLayoutEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_CalculateLayoutEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_CalculateLayoutEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCalculateLayoutEvent *)new wxCalculateLayoutEvent(arg1); @@ -7035,12 +7642,17 @@ static PyObject *_wrap_CalculateLayoutEvent_SetFlags(PyObject *self, PyObject *a wxCalculateLayoutEvent *arg1 = (wxCalculateLayoutEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CalculateLayoutEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalculateLayoutEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalculateLayoutEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -7073,7 +7685,7 @@ static PyObject *_wrap_CalculateLayoutEvent_GetFlags(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7163,15 +7775,21 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb 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 *)"Oi|OOlO:new_SashLayoutWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SashLayoutWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -7184,6 +7802,12 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -7253,16 +7877,22 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SashLayoutWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SashLayoutWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -7275,6 +7905,12 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -7289,7 +7925,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -7322,7 +7958,7 @@ static PyObject *_wrap_SashLayoutWindow_GetAlignment(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7347,7 +7983,7 @@ static PyObject *_wrap_SashLayoutWindow_GetOrientation(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7359,12 +7995,17 @@ static PyObject *_wrap_SashLayoutWindow_SetAlignment(PyObject *self, PyObject *a wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashLayoutWindow_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashLayoutWindow_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutAlignment) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxLayoutAlignment )arg2); @@ -7415,12 +8056,17 @@ static PyObject *_wrap_SashLayoutWindow_SetOrientation(PyObject *self, PyObject wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashLayoutWindow_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashLayoutWindow_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutOrientation) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation((wxLayoutOrientation )arg2); @@ -7514,7 +8160,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7547,7 +8193,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7580,7 +8226,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7600,12 +8246,19 @@ static PyObject *_wrap_new_PopupWindow(PyObject *self, PyObject *args, PyObject int arg2 = (int) wxBORDER_NONE ; wxPopupWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_PopupWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PopupWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPopupWindow *)new wxPopupWindow(arg1,arg2); @@ -7650,13 +8303,20 @@ static PyObject *_wrap_PopupWindow_Create(PyObject *self, PyObject *args, PyObje bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:PopupWindow_Create",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PopupWindow_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPopupWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3); @@ -7664,7 +8324,7 @@ static PyObject *_wrap_PopupWindow_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -7722,12 +8382,19 @@ static PyObject *_wrap_new_PopupTransientWindow(PyObject *self, PyObject *args, int arg2 = (int) wxBORDER_NONE ; wxPyPopupTransientWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_PopupTransientWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PopupTransientWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyPopupTransientWindow *)new wxPyPopupTransientWindow(arg1,arg2); @@ -7864,18 +8531,25 @@ static PyObject *_wrap_new_TipWindow(PyObject *self, PyObject *args, PyObject *k bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "text",(char *) "maxLength",(char *) "rectBound", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iO:new_TipWindow",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_TipWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -7979,15 +8653,23 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj 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 *)"O|iOOlO:new_VScrolledWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_VScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8000,6 +8682,12 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -8099,16 +8787,24 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:VScrolledWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:VScrolledWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8121,6 +8817,12 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -8135,7 +8837,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -8163,7 +8865,7 @@ static PyObject *_wrap_VScrolledWindow_SetLineCount(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_SetLineCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8194,7 +8896,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollToLine",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8204,7 +8906,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8217,12 +8919,17 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lines", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VScrolledWindow_ScrollLines",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollLines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollLines(arg2); @@ -8230,7 +8937,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8243,12 +8950,17 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pages", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VScrolledWindow_ScrollPages",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollPages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollPages(arg2); @@ -8256,7 +8968,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8276,7 +8988,7 @@ static PyObject *_wrap_VScrolledWindow_RefreshLine(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_RefreshLine",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8308,11 +9020,11 @@ static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VScrolledWindow_RefreshLines",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -8336,12 +9048,22 @@ static PyObject *_wrap_VScrolledWindow_HitTestXT(PyObject *self, PyObject *args, int 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 *)"Oii:VScrolledWindow_HitTestXT",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VScrolledWindow_HitTestXT",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyVScrolledWindow const *)arg1)->HitTest(arg2,arg3); @@ -8349,7 +9071,7 @@ static PyObject *_wrap_VScrolledWindow_HitTestXT(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8381,7 +9103,7 @@ static PyObject *_wrap_VScrolledWindow_HitTest(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8430,7 +9152,7 @@ static PyObject *_wrap_VScrolledWindow_GetLineCount(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8455,7 +9177,7 @@ static PyObject *_wrap_VScrolledWindow_GetFirstVisibleLine(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8480,7 +9202,7 @@ static PyObject *_wrap_VScrolledWindow_GetLastVisibleLine(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8501,7 +9223,7 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_IsVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8511,7 +9233,7 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8525,7 +9247,7 @@ static PyObject * VScrolledWindow_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_VListBoxNameStr_set(PyObject *_val) { +static int _wrap_VListBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable VListBoxNameStr is read-only."); return 1; } @@ -8561,15 +9283,23 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw 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 *)"O|iOOlO:new_VListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_VListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8582,6 +9312,12 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -8681,16 +9417,24 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:VListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:VListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8703,6 +9447,12 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -8717,7 +9467,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -8750,7 +9500,7 @@ static PyObject *_wrap_VListBox_GetItemCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8775,7 +9525,7 @@ static PyObject *_wrap_VListBox_HasMultipleSelection(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8800,7 +9550,7 @@ static PyObject *_wrap_VListBox_GetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8821,7 +9571,7 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_IsCurrent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8831,7 +9581,7 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8852,7 +9602,7 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_IsSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -8862,7 +9612,7 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -8887,7 +9637,7 @@ static PyObject *_wrap_VListBox_GetSelectedCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SPyObj_FromUnsignedLong((unsigned long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8918,7 +9668,7 @@ static PyObject *_wrap_VListBox_GetFirstSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8949,7 +9699,7 @@ static PyObject *_wrap_VListBox_GetNextSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9026,7 +9776,7 @@ static PyObject *_wrap_VListBox_SetItemCount(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_SetItemCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9072,12 +9822,17 @@ static PyObject *_wrap_VListBox_SetSelection(PyObject *self, PyObject *args, PyO wxPyVListBox *arg1 = (wxPyVListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "selection", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VListBox_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -9108,12 +9863,12 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:VListBox_Select",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -9124,7 +9879,7 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9147,11 +9902,11 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VListBox_SelectRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { - arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); if (PyErr_Occurred()) SWIG_fail; } { @@ -9161,7 +9916,7 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9181,7 +9936,7 @@ static PyObject *_wrap_VListBox_Toggle(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_Toggle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9216,7 +9971,7 @@ static PyObject *_wrap_VListBox_SelectAll(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9241,7 +9996,7 @@ static PyObject *_wrap_VListBox_DeselectAll(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9285,12 +10040,22 @@ static PyObject *_wrap_VListBox_SetMarginsXY(PyObject *self, PyObject *args, PyO int arg2 ; int 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 *)"Oii:VListBox_SetMarginsXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VListBox_SetMarginsXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -9359,15 +10124,23 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject 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 *)"O|iOOlO:new_HtmlListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_HtmlListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -9380,6 +10153,12 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -9479,16 +10258,24 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje bool temp7 = 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 *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:HtmlListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:HtmlListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -9501,6 +10288,12 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -9515,7 +10308,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp7) delete arg7; @@ -9567,7 +10360,7 @@ static PyObject *_wrap_HtmlListBox_SetItemCount(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlListBox_SetItemCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -9655,7 +10448,7 @@ static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9680,7 +10473,7 @@ static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9722,7 +10515,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -9755,7 +10548,7 @@ static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9783,7 +10576,7 @@ static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -9802,12 +10595,17 @@ static PyObject *_wrap_new_TaskBarIconEvent(PyObject *self, PyObject *args, PyOb wxEventType arg1 ; wxTaskBarIcon *arg2 = (wxTaskBarIcon *) 0 ; wxTaskBarIconEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "evtType",(char *) "tbIcon", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iO:new_TaskBarIconEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_TaskBarIconEvent",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTaskBarIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9830,7 +10628,7 @@ static PyObject * TaskBarIconEvent_swigregister(PyObject *self, PyObject *args) Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_FileSelectorPromptStr_set(PyObject *_val) { +static int _wrap_FileSelectorPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only."); return 1; } @@ -9850,7 +10648,7 @@ static PyObject *_wrap_FileSelectorPromptStr_get() { } -static int _wrap_DirSelectorPromptStr_set(PyObject *_val) { +static int _wrap_DirSelectorPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only."); return 1; } @@ -9870,7 +10668,7 @@ static PyObject *_wrap_DirSelectorPromptStr_get() { } -static int _wrap_DirDialogNameStr_set(PyObject *_val) { +static int _wrap_DirDialogNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DirDialogNameStr is read-only."); return 1; } @@ -9890,7 +10688,7 @@ static PyObject *_wrap_DirDialogNameStr_get() { } -static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) { +static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only."); return 1; } @@ -9910,7 +10708,7 @@ static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() { } -static int _wrap_GetTextFromUserPromptStr_set(PyObject *_val) { +static int _wrap_GetTextFromUserPromptStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GetTextFromUserPromptStr is read-only."); return 1; } @@ -9930,7 +10728,7 @@ static PyObject *_wrap_GetTextFromUserPromptStr_get() { } -static int _wrap_MessageBoxCaptionStr_set(PyObject *_val) { +static int _wrap_MessageBoxCaptionStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable MessageBoxCaptionStr is read-only."); return 1; } @@ -10014,7 +10812,7 @@ static PyObject *_wrap_ColourData_GetChooseFull(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -10056,12 +10854,17 @@ static PyObject *_wrap_ColourData_GetCustomColour(PyObject *self, PyObject *args int arg2 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ColourData_GetCustomColour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourData_GetCustomColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCustomColour(arg2); @@ -10085,12 +10888,17 @@ static PyObject *_wrap_ColourData_SetChooseFull(PyObject *self, PyObject *args, wxColourData *arg1 = (wxColourData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ColourData_SetChooseFull",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourData_SetChooseFull",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetChooseFull(arg2); @@ -10143,13 +10951,18 @@ static PyObject *_wrap_ColourData_SetCustomColour(PyObject *self, PyObject *args wxColour *arg3 = 0 ; wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ColourData_SetCustomColour",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourData_SetCustomColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; @@ -10251,7 +11064,7 @@ static PyObject *_wrap_ColourDialog_ShowModal(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10288,6 +11101,7 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; @@ -10295,7 +11109,7 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k (char *) "parent",(char *) "message",(char *) "defaultPath",(char *) "style",(char *) "pos",(char *) "size",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOlOOO:new_DirDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_DirDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { @@ -10311,6 +11125,12 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k temp3 = True; } } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = &temp5; @@ -10448,7 +11268,7 @@ static PyObject *_wrap_DirDialog_GetStyle(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -10553,7 +11373,7 @@ static PyObject *_wrap_DirDialog_ShowModal(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -10592,12 +11412,13 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject * PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "defaultDir",(char *) "defaultFile",(char *) "wildcard",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOlO:new_FileDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_FileDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { @@ -10627,6 +11448,12 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject * temp5 = True; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = &temp7; @@ -10884,12 +11711,17 @@ static PyObject *_wrap_FileDialog_SetStyle(PyObject *self, PyObject *args, PyObj wxFileDialog *arg1 = (wxFileDialog *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:FileDialog_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -10909,12 +11741,17 @@ static PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *self, PyObject *args, wxFileDialog *arg1 = (wxFileDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "filterIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FileDialog_SetFilterIndex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetFilterIndex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFilterIndex(arg2); @@ -11102,7 +11939,7 @@ static PyObject *_wrap_FileDialog_GetStyle(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -11127,7 +11964,7 @@ static PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11209,13 +12046,15 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, 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 *) "parent",(char *) "message",(char *) "caption",(char *) "LCOUNT",(char *) "choices",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiO|lO:new_MultiChoiceDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:new_MultiChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11227,11 +12066,21 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO if (arg3 == NULL) SWIG_fail; temp3 = True; } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; temp5 = True; } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = &temp7; @@ -11373,12 +12222,13 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "caption",(char *) "choices",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|lO:new_SingleChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&arg6,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:new_SingleChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11395,6 +12245,12 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py arg5 = wxString_LIST_helper(obj3); if (arg5 == NULL) SWIG_fail; } + if (obj4) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg7 = &temp6; @@ -11455,7 +12311,7 @@ static PyObject *_wrap_SingleChoiceDialog_GetSelection(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11498,12 +12354,17 @@ static PyObject *_wrap_SingleChoiceDialog_SetSelection(PyObject *self, PyObject wxSingleChoiceDialog *arg1 = (wxSingleChoiceDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SingleChoiceDialog_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SingleChoiceDialog_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSingleChoiceDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -11536,7 +12397,7 @@ static PyObject *_wrap_SingleChoiceDialog_ShowModal(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11570,12 +12431,13 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "caption",(char *) "defaultValue",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOlO:new_TextEntryDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_TextEntryDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11596,6 +12458,12 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj temp4 = True; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = &temp6; @@ -11729,7 +12597,7 @@ static PyObject *_wrap_TextEntryDialog_ShowModal(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11802,7 +12670,7 @@ static PyObject *_wrap_FontData_EnableEffects(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_EnableEffects",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -11837,7 +12705,7 @@ static PyObject *_wrap_FontData_GetAllowSymbols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11920,7 +12788,7 @@ static PyObject *_wrap_FontData_GetEnableEffects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11974,7 +12842,7 @@ static PyObject *_wrap_FontData_GetShowHelp(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -11994,7 +12862,7 @@ static PyObject *_wrap_FontData_SetAllowSymbols(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_SetAllowSymbols",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12108,12 +12976,22 @@ static PyObject *_wrap_FontData_SetRange(PyObject *self, PyObject *args, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:FontData_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FontData_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2,arg3); @@ -12141,7 +13019,7 @@ static PyObject *_wrap_FontData_SetShowHelp(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_SetShowHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -12242,7 +13120,7 @@ static PyObject *_wrap_FontDialog_ShowModal(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12272,12 +13150,13 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "caption",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OlO:new_MessageDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_MessageDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -12291,6 +13170,12 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec temp3 = True; } } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = &temp5; @@ -12345,7 +13230,7 @@ static PyObject *_wrap_MessageDialog_ShowModal(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12371,12 +13256,14 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "title",(char *) "message",(char *) "maximum",(char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOi:new_ProgressDialog",kwnames,&obj0,&obj1,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_ProgressDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -12387,9 +13274,21 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje if (arg2 == NULL) SWIG_fail; temp2 = True; } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxProgressDialog *)new wxProgressDialog((wxString const &)*arg1,(wxString const &)*arg2,arg3,arg4,arg5); @@ -12429,13 +13328,18 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO bool result; bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "value",(char *) "newmsg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:ProgressDialog_Update",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ProgressDialog_Update",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProgressDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -12450,7 +13354,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp3) delete arg3; @@ -12501,11 +13405,25 @@ static PyObject *_wrap_new_FindDialogEvent(PyObject *self, PyObject *args, PyObj wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxFindDialogEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_FindDialogEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FindDialogEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFindDialogEvent *)new wxFindDialogEvent(arg1,arg2); @@ -12538,7 +13456,7 @@ static PyObject *_wrap_FindDialogEvent_GetFlags(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12643,12 +13561,17 @@ static PyObject *_wrap_FindDialogEvent_SetFlags(PyObject *self, PyObject *args, wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FindDialogEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FindDialogEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindDialogEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -12754,11 +13677,18 @@ static PyObject *_wrap_new_FindReplaceData(PyObject *self, PyObject *args, PyObj PyObject *resultobj; int arg1 = (int) 0 ; wxFindReplaceData *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_FindReplaceData",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FindReplaceData",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFindReplaceData *)new wxFindReplaceData(arg1); @@ -12883,7 +13813,7 @@ static PyObject *_wrap_FindReplaceData_GetFlags(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12895,12 +13825,17 @@ static PyObject *_wrap_FindReplaceData_SetFlags(PyObject *self, PyObject *args, wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FindReplaceData_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FindReplaceData_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -13013,11 +13948,12 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "data",(char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:new_FindReplaceDialog",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:new_FindReplaceDialog",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -13025,6 +13961,12 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO if (arg3 == NULL) SWIG_fail; temp3 = True; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFindReplaceDialog *)new wxFindReplaceDialog(arg1,arg2,(wxString const &)*arg3,arg4); @@ -13082,11 +14024,12 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "data",(char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|i:FindReplaceDialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:FindReplaceDialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindReplaceDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -13095,6 +14038,12 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, if (arg4 == NULL) SWIG_fail; temp4 = True; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,arg5); @@ -13102,7 +14051,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -13194,16 +14143,22 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MDIParentFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MDIParentFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -13221,6 +14176,12 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -13300,17 +14261,23 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MDIParentFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MDIParentFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -13328,6 +14295,12 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -13342,7 +14315,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -13672,16 +14645,22 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec wxSize temp5 ; bool temp7 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MDIChildFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MDIChildFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -13699,6 +14678,12 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -13782,17 +14767,23 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb bool temp8 = 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 *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MDIChildFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MDIChildFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIChildFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; @@ -13810,6 +14801,12 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); @@ -13824,7 +14821,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -13884,7 +14881,7 @@ static PyObject *_wrap_MDIChildFrame_Maximize(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MDIChildFrame_Maximize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIChildFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -13938,12 +14935,19 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj long arg2 = (long) 0 ; wxMDIClientWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:new_MDIClientWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_MDIClientWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMDIClientWindow *)new wxMDIClientWindow(arg1,arg2); @@ -13992,13 +14996,20 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:MDIClientWindow_Create",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MDIClientWindow_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIClientWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3); @@ -14006,7 +15017,7 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14036,15 +15047,21 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw 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 *)"Oi|OOlO:new_PyWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PyWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -14057,6 +15074,12 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -14124,12 +15147,32 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *self, PyObject *args int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyWindow_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -14153,12 +15196,39 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *self, PyObject *args, P int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyWindow_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -14179,12 +15249,22 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *self, PyObject *a int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyWindow_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -14205,12 +15285,22 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *self, PyObject * int arg2 ; int 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 *)"Oii:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -14439,7 +15529,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14464,7 +15554,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14489,7 +15579,7 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14514,7 +15604,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14539,7 +15629,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -14652,15 +15742,21 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa 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 *)"Oi|OOlO:new_PyPanel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PyPanel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -14673,6 +15769,12 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -14740,12 +15842,32 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *self, PyObject *args, int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyPanel_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -14769,12 +15891,39 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *self, PyObject *args, Py int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyPanel_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -14795,12 +15944,22 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *self, PyObject *ar int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyPanel_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -14821,12 +15980,22 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *self, PyObject *a int arg2 ; int 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 *)"Oii:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -15055,7 +16224,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15080,7 +16249,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15105,7 +16274,7 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15130,7 +16299,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15155,7 +16324,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15252,7 +16421,7 @@ static PyObject * PyPanel_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_PrintoutTitleStr_set(PyObject *_val) { +static int _wrap_PrintoutTitleStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable PrintoutTitleStr is read-only."); return 1; } @@ -15272,7 +16441,7 @@ static PyObject *_wrap_PrintoutTitleStr_get() { } -static int _wrap_PreviewCanvasNameStr_set(PyObject *_val) { +static int _wrap_PreviewCanvasNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable PreviewCanvasNameStr is read-only."); return 1; } @@ -15356,7 +16525,7 @@ static PyObject *_wrap_PrintData_GetNoCopies(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15381,7 +16550,7 @@ static PyObject *_wrap_PrintData_GetCollate(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15406,7 +16575,7 @@ static PyObject *_wrap_PrintData_GetOrientation(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15431,7 +16600,7 @@ static PyObject *_wrap_PrintData_Ok(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15490,7 +16659,7 @@ static PyObject *_wrap_PrintData_GetColour(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -15515,7 +16684,7 @@ static PyObject *_wrap_PrintData_GetDuplex(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15540,7 +16709,7 @@ static PyObject *_wrap_PrintData_GetPaperId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15593,7 +16762,7 @@ static PyObject *_wrap_PrintData_GetQuality(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15605,12 +16774,17 @@ static PyObject *_wrap_PrintData_SetNoCopies(PyObject *self, PyObject *args, PyO wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetNoCopies",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetNoCopies",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNoCopies(arg2); @@ -15638,7 +16812,7 @@ static PyObject *_wrap_PrintData_SetCollate(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetCollate",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15660,12 +16834,17 @@ static PyObject *_wrap_PrintData_SetOrientation(PyObject *self, PyObject *args, wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -15733,7 +16912,7 @@ static PyObject *_wrap_PrintData_SetColour(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -15755,12 +16934,17 @@ static PyObject *_wrap_PrintData_SetDuplex(PyObject *self, PyObject *args, PyObj wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "duplex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetDuplex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetDuplex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDuplexMode) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDuplex((wxDuplexMode )arg2); @@ -15780,12 +16964,17 @@ static PyObject *_wrap_PrintData_SetPaperId(PyObject *self, PyObject *args, PyOb wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sizeId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetPaperId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPaperId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPaperSize) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPaperId((wxPaperSize )arg2); @@ -15836,12 +17025,17 @@ static PyObject *_wrap_PrintData_SetQuality(PyObject *self, PyObject *args, PyOb wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "quality", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetQuality",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetQuality",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetQuality(arg2); @@ -16044,7 +17238,7 @@ static PyObject *_wrap_PrintData_GetPrinterScaleX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -16069,7 +17263,7 @@ static PyObject *_wrap_PrintData_GetPrinterScaleY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -16094,7 +17288,7 @@ static PyObject *_wrap_PrintData_GetPrinterTranslateX(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16119,7 +17313,7 @@ static PyObject *_wrap_PrintData_GetPrinterTranslateY(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -16144,7 +17338,7 @@ static PyObject *_wrap_PrintData_GetPrintMode(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16356,12 +17550,17 @@ static PyObject *_wrap_PrintData_SetPrinterScaleX(PyObject *self, PyObject *args wxPrintData *arg1 = (wxPrintData *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PrintData_SetPrinterScaleX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaleX(arg2); @@ -16381,12 +17580,17 @@ static PyObject *_wrap_PrintData_SetPrinterScaleY(PyObject *self, PyObject *args wxPrintData *arg1 = (wxPrintData *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PrintData_SetPrinterScaleY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaleY(arg2); @@ -16407,12 +17611,22 @@ static PyObject *_wrap_PrintData_SetPrinterScaling(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:PrintData_SetPrinterScaling",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterScaling",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaling(arg2,arg3); @@ -16432,12 +17646,17 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateX(PyObject *self, PyObject * wxPrintData *arg1 = (wxPrintData *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PrintData_SetPrinterTranslateX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslateX(arg2); @@ -16457,12 +17676,17 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateY(PyObject *self, PyObject * wxPrintData *arg1 = (wxPrintData *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PrintData_SetPrinterTranslateY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslateY(arg2); @@ -16483,12 +17707,22 @@ static PyObject *_wrap_PrintData_SetPrinterTranslation(PyObject *self, PyObject long arg2 ; long 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 *)"Oll:PrintData_SetPrinterTranslation",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterTranslation",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslation(arg2,arg3); @@ -16508,12 +17742,17 @@ static PyObject *_wrap_PrintData_SetPrintMode(PyObject *self, PyObject *args, Py wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "printMode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetPrintMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrintMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPrintMode) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrintMode((wxPrintMode )arg2); @@ -16594,7 +17833,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16624,7 +17863,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableMargins",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16654,7 +17893,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *self, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16684,7 +17923,7 @@ static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePaper",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16714,7 +17953,7 @@ static PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePrinter",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -16749,7 +17988,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16774,7 +18013,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16799,7 +18038,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16824,7 +18063,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16849,7 +18088,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16874,7 +18113,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -16899,7 +18138,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17040,7 +18279,7 @@ static PyObject *_wrap_PageSetupDialogData_GetPaperId(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17122,7 +18361,7 @@ static PyObject *_wrap_PageSetupDialogData_Ok(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17142,7 +18381,7 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultInfo",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17172,7 +18411,7 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *self, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultMinMargins",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17318,12 +18557,17 @@ static PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *self, PyObject * wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PageSetupDialogData_SetPaperId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPaperId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPaperSize) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPaperId((wxPaperSize )arg2); @@ -17482,7 +18726,7 @@ static PyObject *_wrap_PageSetupDialog_ShowModal(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17560,7 +18804,7 @@ static PyObject *_wrap_PrintDialogData_GetFromPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17585,7 +18829,7 @@ static PyObject *_wrap_PrintDialogData_GetToPage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17610,7 +18854,7 @@ static PyObject *_wrap_PrintDialogData_GetMinPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17635,7 +18879,7 @@ static PyObject *_wrap_PrintDialogData_GetMaxPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17660,7 +18904,7 @@ static PyObject *_wrap_PrintDialogData_GetNoCopies(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17685,7 +18929,7 @@ static PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17710,7 +18954,7 @@ static PyObject *_wrap_PrintDialogData_GetSelection(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17735,7 +18979,7 @@ static PyObject *_wrap_PrintDialogData_GetCollate(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17760,7 +19004,7 @@ static PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17785,7 +19029,7 @@ static PyObject *_wrap_PrintDialogData_GetSetupDialog(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -17797,12 +19041,17 @@ static PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *self, PyObject *arg wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetFromPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetFromPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFromPage(arg2); @@ -17822,12 +19071,17 @@ static PyObject *_wrap_PrintDialogData_SetToPage(PyObject *self, PyObject *args, wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetToPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetToPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToPage(arg2); @@ -17847,12 +19101,17 @@ static PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *self, PyObject *args wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetMinPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMinPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinPage(arg2); @@ -17872,12 +19131,17 @@ static PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *self, PyObject *args wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetMaxPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMaxPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaxPage(arg2); @@ -17897,12 +19161,17 @@ static PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *self, PyObject *arg wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetNoCopies",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetNoCopies",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNoCopies(arg2); @@ -17930,7 +19199,7 @@ static PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetAllPages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17960,7 +19229,7 @@ static PyObject *_wrap_PrintDialogData_SetSelection(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -17990,7 +19259,7 @@ static PyObject *_wrap_PrintDialogData_SetCollate(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetCollate",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18020,7 +19289,7 @@ static PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetPrintToFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18050,7 +19319,7 @@ static PyObject *_wrap_PrintDialogData_SetSetupDialog(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSetupDialog",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18080,7 +19349,7 @@ static PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePrintToFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18110,7 +19379,7 @@ static PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18140,7 +19409,7 @@ static PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePageNumbers",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18170,7 +19439,7 @@ static PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -18205,7 +19474,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18230,7 +19499,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18255,7 +19524,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18280,7 +19549,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18305,7 +19574,7 @@ static PyObject *_wrap_PrintDialogData_Ok(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18480,7 +19749,7 @@ static PyObject *_wrap_PrintDialog_ShowModal(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18613,14 +19882,21 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "printout",(char *) "prompt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Printer_Print",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Printer_Print",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrinter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Print(arg2,arg3,arg4); @@ -18628,7 +19904,7 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18732,7 +20008,7 @@ static PyObject *_wrap_Printer_Setup(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18757,7 +20033,7 @@ static PyObject *_wrap_Printer_GetAbort(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -18779,7 +20055,7 @@ static PyObject *_wrap_Printer_GetLastError(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18957,12 +20233,22 @@ static PyObject *_wrap_Printout_SetPageSizePixels(PyObject *self, PyObject *args int arg2 ; int 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 *)"Oii:Printout_SetPageSizePixels",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPageSizePixels",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPageSizePixels(arg2,arg3); @@ -19021,12 +20307,22 @@ static PyObject *_wrap_Printout_SetPageSizeMM(PyObject *self, PyObject *args, Py int arg2 ; int 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 *)"Oii:Printout_SetPageSizeMM",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPageSizeMM",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPageSizeMM(arg2,arg3); @@ -19085,12 +20381,22 @@ static PyObject *_wrap_Printout_SetPPIScreen(PyObject *self, PyObject *args, PyO int arg2 ; int 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 *)"Oii:Printout_SetPPIScreen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPPIScreen",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPPIScreen(arg2,arg3); @@ -19149,12 +20455,22 @@ static PyObject *_wrap_Printout_SetPPIPrinter(PyObject *self, PyObject *args, Py int arg2 ; int 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 *)"Oii:Printout_SetPPIPrinter",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPPIPrinter",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPPIPrinter(arg2,arg3); @@ -19225,7 +20541,7 @@ static PyObject *_wrap_Printout_IsPreview(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19245,7 +20561,7 @@ static PyObject *_wrap_Printout_SetIsPreview(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_SetIsPreview",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -19269,12 +20585,22 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "startPage",(char *) "endPage", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Printout_base_OnBeginDocument",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_base_OnBeginDocument",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnBeginDocument(arg2,arg3); @@ -19282,7 +20608,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19391,12 +20717,17 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyO int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "page", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Printout_base_HasPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_base_HasPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_HasPage(arg2); @@ -19404,7 +20735,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -19489,12 +20820,13 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOlO:new_PreviewCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PreviewCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { @@ -19509,6 +20841,12 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); @@ -19567,12 +20905,13 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOlO:new_PreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -19592,6 +20931,12 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -19750,16 +21095,22 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO wxSize temp5 ; bool temp7 = 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 *) "preview",(char *) "buttons",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|OOlO:new_PreviewControlBar",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj3) { { @@ -19773,6 +21124,12 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -19820,7 +21177,7 @@ static PyObject *_wrap_PreviewControlBar_GetZoomControl(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19832,12 +21189,17 @@ static PyObject *_wrap_PreviewControlBar_SetZoomControl(PyObject *self, PyObject wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "zoom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PreviewControlBar_SetZoomControl",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PreviewControlBar_SetZoomControl",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPreviewControlBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetZoomControl(arg2); @@ -20043,12 +21405,17 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_SetCurrentPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetCurrentPage(arg2); @@ -20056,7 +21423,7 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20081,7 +21448,7 @@ static PyObject *_wrap_PrintPreview_GetCurrentPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20302,7 +21669,7 @@ static PyObject *_wrap_PrintPreview_PaintPage(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20336,7 +21703,7 @@ static PyObject *_wrap_PrintPreview_DrawBlankPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20349,12 +21716,17 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_RenderPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_RenderPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->RenderPage(arg2); @@ -20362,7 +21734,7 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20429,12 +21801,17 @@ static PyObject *_wrap_PrintPreview_SetZoom(PyObject *self, PyObject *args, PyOb wxPrintPreview *arg1 = (wxPrintPreview *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "percent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_SetZoom",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetZoom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetZoom(arg2); @@ -20467,7 +21844,7 @@ static PyObject *_wrap_PrintPreview_GetZoom(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20492,7 +21869,7 @@ static PyObject *_wrap_PrintPreview_GetMaxPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20517,7 +21894,7 @@ static PyObject *_wrap_PrintPreview_GetMinPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20542,7 +21919,7 @@ static PyObject *_wrap_PrintPreview_Ok(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20562,7 +21939,7 @@ static PyObject *_wrap_PrintPreview_SetOk(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetOk",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20593,7 +21970,7 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_Print",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20603,7 +21980,7 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20710,12 +22087,17 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_SetCurrentPage(arg2); @@ -20723,7 +22105,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20757,7 +22139,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20791,7 +22173,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20804,12 +22186,17 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_RenderPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_RenderPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_RenderPage(arg2); @@ -20817,7 +22204,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20829,12 +22216,17 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *self, PyObject *arg wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "percent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_SetZoom",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetZoom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetZoom(arg2); @@ -20863,7 +22255,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_Print",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (bool) SPyObj_AsBool(obj1); + arg2 = (bool) SWIG_PyObj_AsBool(obj1); if (PyErr_Occurred()) SWIG_fail; } { @@ -20873,7 +22265,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -20933,12 +22325,13 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOlO:new_PyPreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { @@ -20958,6 +22351,12 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -21175,16 +22574,22 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P wxSize temp5 ; bool temp7 = 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 *) "preview",(char *) "buttons",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|OOlO:new_PyPreviewControlBar",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj3) { { @@ -21198,6 +22603,12 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); @@ -21313,12 +22724,17 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *self, P wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "zoom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPreviewControlBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetZoomControl(arg2); @@ -23056,6 +24472,7 @@ static swig_type_info _swigt__p_wxCalculateLayoutEvent[] = {{"_p_wxCalculateLayo static swig_type_info _swigt__p_wxPyHtmlListBox[] = {{"_p_wxPyHtmlListBox", 0, "wxPyHtmlListBox *", 0},{"_p_wxPyHtmlListBox"},{0}}; static swig_type_info _swigt__p_wxPyVListBox[] = {{"_p_wxPyVListBox", 0, "wxPyVListBox *", 0},{"_p_wxPyVListBox"},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVListBox},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxMiniFrame[] = {{"_p_wxMiniFrame", 0, "wxMiniFrame *", 0},{"_p_wxMiniFrame"},{0}}; static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxFrame},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxFrame},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxFrame},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxFrame},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxFrame},{"_p_wxFrame"},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxFrame},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxFrame},{0}}; static swig_type_info _swigt__p_wxPyPrintout[] = {{"_p_wxPyPrintout", 0, "wxPyPrintout *", 0},{"_p_wxPyPrintout"},{0}}; @@ -23070,6 +24487,7 @@ static swig_type_info _swigt__p_wxMDIClientWindow[] = {{"_p_wxMDIClientWindow", static swig_type_info _swigt__p_wxTipWindow[] = {{"_p_wxTipWindow", 0, "wxTipWindow *", 0},{"_p_wxTipWindow"},{0}}; static swig_type_info _swigt__p_wxSashLayoutWindow[] = {{"_p_wxSashLayoutWindow", 0, "wxSashLayoutWindow *", 0},{"_p_wxSashLayoutWindow"},{0}}; static swig_type_info _swigt__p_wxSplitterWindow[] = {{"_p_wxSplitterWindow", 0, "wxSplitterWindow *", 0},{"_p_wxSplitterWindow"},{0}}; +static swig_type_info _swigt__p_wxSplashScreenWindow[] = {{"_p_wxSplashScreenWindow", 0, "wxSplashScreenWindow *", 0},{"_p_wxSplashScreenWindow"},{0}}; static swig_type_info _swigt__p_wxPyVScrolledWindow[] = {{"_p_wxPyVScrolledWindow", 0, "wxPyVScrolledWindow *", 0},{"_p_wxPyVScrolledWindow"},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPyVScrolledWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVScrolledWindow},{0}}; static swig_type_info _swigt__p_wxPyPopupTransientWindow[] = {{"_p_wxPyPopupTransientWindow", 0, "wxPyPopupTransientWindow *", 0},{"_p_wxPyPopupTransientWindow"},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxPyPopupTransientWindow},{0}}; static swig_type_info _swigt__p_wxPopupWindow[] = {{"_p_wxPopupWindow", 0, "wxPopupWindow *", 0},{"_p_wxPopupWindow"},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxPopupWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxPopupWindow},{0}}; @@ -23077,7 +24495,6 @@ static swig_type_info _swigt__p_wxSashWindow[] = {{"_p_wxSashWindow", 0, "wxSash static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, "wxTopLevelWindow *", 0},{"_p_wxFrame", _p_wxFrameTo_p_wxTopLevelWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxTopLevelWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxTopLevelWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxTopLevelWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxTopLevelWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxTopLevelWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxTopLevelWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxTopLevelWindow},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxTopLevelWindow},{"_p_wxTopLevelWindow"},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxTopLevelWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxTopLevelWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxTopLevelWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxTopLevelWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxTopLevelWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxTopLevelWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxTopLevelWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxTopLevelWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxTopLevelWindow},{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_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_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_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{0}}; -static swig_type_info _swigt__p_wxSplashScreenWindow[] = {{"_p_wxSplashScreenWindow", 0, "wxSplashScreenWindow *", 0},{"_p_wxSplashScreenWindow"},{0}}; static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0},{"_p_wxMenuBar"},{0}}; static swig_type_info _swigt__p_wxPrintPreview[] = {{"_p_wxPrintPreview", 0, "wxPrintPreview *", 0},{"_p_wxPrintPreview"},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxPrintPreview},{0}}; static swig_type_info _swigt__p_wxSashEvent[] = {{"_p_wxSashEvent", 0, "wxSashEvent *", 0},{"_p_wxSashEvent"},{0}}; @@ -23096,8 +24513,8 @@ static swig_type_info _swigt__p_wxPreviewControlBar[] = {{"_p_wxPreviewControlBa static swig_type_info _swigt__p_wxPyPreviewControlBar[] = {{"_p_wxPyPreviewControlBar", 0, "wxPyPreviewControlBar *", 0},{"_p_wxPyPreviewControlBar"},{0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}}; static swig_type_info _swigt__p_wxToolBar[] = {{"_p_wxToolBar", 0, "wxToolBar *", 0},{"_p_wxToolBar"},{0}}; -static swig_type_info _swigt__p_wxPrintDialogData[] = {{"_p_wxPrintDialogData", 0, "wxPrintDialogData *", 0},{"_p_wxPrintDialogData"},{0}}; static swig_type_info _swigt__p_wxPageSetupDialogData[] = {{"_p_wxPageSetupDialogData", 0, "wxPageSetupDialogData *", 0},{"_p_wxPageSetupDialogData"},{0}}; +static swig_type_info _swigt__p_wxPrintDialogData[] = {{"_p_wxPrintDialogData", 0, "wxPrintDialogData *", 0},{"_p_wxPrintDialogData"},{0}}; static swig_type_info *swig_types_initial[] = { _swigt__p_wxQueryLayoutInfoEvent, @@ -23140,6 +24557,7 @@ _swigt__p_wxCalculateLayoutEvent, _swigt__p_wxPyHtmlListBox, _swigt__p_wxPyVListBox, _swigt__p_wxRect, +_swigt__p_char, _swigt__p_wxMiniFrame, _swigt__p_wxFrame, _swigt__p_wxPyPrintout, @@ -23154,6 +24572,7 @@ _swigt__p_wxMDIClientWindow, _swigt__p_wxTipWindow, _swigt__p_wxSashLayoutWindow, _swigt__p_wxSplitterWindow, +_swigt__p_wxSplashScreenWindow, _swigt__p_wxPyVScrolledWindow, _swigt__p_wxPyPopupTransientWindow, _swigt__p_wxPopupWindow, @@ -23161,7 +24580,6 @@ _swigt__p_wxSashWindow, _swigt__p_wxTopLevelWindow, _swigt__p_wxWindow, _swigt__p_wxScrolledWindow, -_swigt__p_wxSplashScreenWindow, _swigt__p_wxMenuBar, _swigt__p_wxPrintPreview, _swigt__p_wxSashEvent, @@ -23180,8 +24598,8 @@ _swigt__p_wxPreviewControlBar, _swigt__p_wxPyPreviewControlBar, _swigt__p_wxColour, _swigt__p_wxToolBar, -_swigt__p_wxPrintDialogData, _swigt__p_wxPageSetupDialogData, +_swigt__p_wxPrintDialogData, 0 }; @@ -23189,115 +24607,6 @@ _swigt__p_wxPageSetupDialogData, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOMENUBAR", (long) wxFULLSCREEN_NOMENUBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOTOOLBAR", (long) wxFULLSCREEN_NOTOOLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOSTATUSBAR", (long) wxFULLSCREEN_NOSTATUSBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOBORDER", (long) wxFULLSCREEN_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOCAPTION", (long) wxFULLSCREEN_NOCAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_ALL", (long) wxFULLSCREEN_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOPLEVEL_EX_DIALOG", (long) wxTOPLEVEL_EX_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_CENTRE_ON_PARENT", (long) wxSPLASH_CENTRE_ON_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_CENTRE_ON_SCREEN", (long) wxSPLASH_CENTRE_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_NO_CENTRE", (long) wxSPLASH_NO_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_TIMEOUT", (long) wxSPLASH_TIMEOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_NO_TIMEOUT", (long) wxSPLASH_NO_TIMEOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_NOBORDER", (long) wxSP_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_NOSASH", (long) wxSP_NOSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_PERMIT_UNSPLIT", (long) wxSP_PERMIT_UNSPLIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_LIVE_UPDATE", (long) wxSP_LIVE_UPDATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3DSASH", (long) wxSP_3DSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3DBORDER", (long) wxSP_3DBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_BORDER", (long) wxSP_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3D", (long) wxSP_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_HORIZONTAL", (long) wxSPLIT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_VERTICAL", (long) wxSPLIT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_NONE", (long) wxSPLIT_DRAG_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_DRAGGING", (long) wxSPLIT_DRAG_DRAGGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_LEFT_DOWN", (long) wxSPLIT_DRAG_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", (long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", (long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", (long) wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_UNSPLIT", (long) wxEVT_COMMAND_SPLITTER_UNSPLIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_NONE", (long) wxSASH_DRAG_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_DRAGGING", (long) wxSASH_DRAG_DRAGGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_LEFT_DOWN", (long) wxSASH_DRAG_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_NOBORDER", (long) wxSW_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_BORDER", (long) wxSW_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3DSASH", (long) wxSW_3DSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3DBORDER", (long) wxSW_3DBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3D", (long) wxSW_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_TOP", (long) wxSASH_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_RIGHT", (long) wxSASH_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_BOTTOM", (long) wxSASH_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_LEFT", (long) wxSASH_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_NONE", (long) wxSASH_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_STATUS_OK", (long) wxSASH_STATUS_OK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_STATUS_OUT_OF_RANGE", (long) wxSASH_STATUS_OUT_OF_RANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SASH_DRAGGED", (long) wxEVT_SASH_DRAGGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_HORIZONTAL", (long) wxLAYOUT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_VERTICAL", (long) wxLAYOUT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_NONE", (long) wxLAYOUT_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_TOP", (long) wxLAYOUT_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LEFT", (long) wxLAYOUT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_RIGHT", (long) wxLAYOUT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_BOTTOM", (long) wxLAYOUT_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LENGTH_Y", (long) wxLAYOUT_LENGTH_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LENGTH_X", (long) wxLAYOUT_LENGTH_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_MRU_LENGTH", (long) wxLAYOUT_MRU_LENGTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_QUERY", (long) wxLAYOUT_QUERY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_LAYOUT_INFO", (long) wxEVT_QUERY_LAYOUT_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALCULATE_LAYOUT", (long) wxEVT_CALCULATE_LAYOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_MOVE", (long) wxEVT_TASKBAR_MOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_DOWN", (long) wxEVT_TASKBAR_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_UP", (long) wxEVT_TASKBAR_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_DOWN", (long) wxEVT_TASKBAR_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_UP", (long) wxEVT_TASKBAR_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_DCLICK", (long) wxEVT_TASKBAR_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_DCLICK", (long) wxEVT_TASKBAR_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHOICEDLG_STYLE", (long) wxCHOICEDLG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_DOWN", (long) wxFR_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_WHOLEWORD", (long) wxFR_WHOLEWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_MATCHCASE", (long) wxFR_MATCHCASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_REPLACEDIALOG", (long) wxFR_REPLACEDIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOUPDOWN", (long) wxFR_NOUPDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOMATCHCASE", (long) wxFR_NOMATCHCASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOWHOLEWORD", (long) wxFR_NOWHOLEWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND", (long) wxEVT_COMMAND_FIND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_NEXT", (long) wxEVT_COMMAND_FIND_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_REPLACE", (long) wxEVT_COMMAND_FIND_REPLACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_REPLACE_ALL", (long) wxEVT_COMMAND_FIND_REPLACE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_CLOSE", (long) wxEVT_COMMAND_FIND_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILE", (long) 4001, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILEHOR", (long) 4001, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWCASCADE", (long) 4002, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWICONS", (long) 4003, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWNEXT", (long) 4004, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILEVERT", (long) 4005, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIRST_MDI_CHILD", (long) 4100, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAST_MDI_CHILD", (long) 4600, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_NONE", (long) wxPRINT_MODE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_PREVIEW", (long) wxPRINT_MODE_PREVIEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_FILE", (long) wxPRINT_MODE_FILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_PRINTER", (long) wxPRINT_MODE_PRINTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_NO_ERROR", (long) wxPRINTER_NO_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_CANCELLED", (long) wxPRINTER_CANCELLED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_ERROR", (long) wxPRINTER_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_PRINT", (long) wxPREVIEW_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_PREVIOUS", (long) wxPREVIEW_PREVIOUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_NEXT", (long) wxPREVIEW_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_ZOOM", (long) wxPREVIEW_ZOOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_FIRST", (long) wxPREVIEW_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_LAST", (long) wxPREVIEW_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_GOTO", (long) wxPREVIEW_GOTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_DEFAULT", (long) wxPREVIEW_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_CLOSE", (long) wxID_PREVIEW_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_NEXT", (long) wxID_PREVIEW_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_PREVIOUS", (long) wxID_PREVIEW_PREVIOUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_PRINT", (long) wxID_PREVIEW_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_ZOOM", (long) wxID_PREVIEW_ZOOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_FIRST", (long) wxID_PREVIEW_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_LAST", (long) wxID_PREVIEW_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_GOTO", (long) wxID_PREVIEW_GOTO, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -23329,14 +24638,65 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"DialogNameStr",_wrap_DialogNameStr_get, _wrap_DialogNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"StatusLineNameStr",_wrap_StatusLineNameStr_get, _wrap_StatusLineNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"ToolBarNameStr",_wrap_ToolBarNameStr_get, _wrap_ToolBarNameStr_set); + PyDict_SetItemString(d,"FULLSCREEN_NOMENUBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOMENUBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOTOOLBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOTOOLBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOSTATUSBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOSTATUSBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOBORDER", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOBORDER)); + PyDict_SetItemString(d,"FULLSCREEN_NOCAPTION", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOCAPTION)); + PyDict_SetItemString(d,"FULLSCREEN_ALL", SWIG_PyObj_FromInt((int)wxFULLSCREEN_ALL)); + PyDict_SetItemString(d,"TOPLEVEL_EX_DIALOG", SWIG_PyObj_FromInt((int)wxTOPLEVEL_EX_DIALOG)); + PyDict_SetItemString(d,"SPLASH_CENTRE_ON_PARENT", SWIG_PyObj_FromInt((int)wxSPLASH_CENTRE_ON_PARENT)); + PyDict_SetItemString(d,"SPLASH_CENTRE_ON_SCREEN", SWIG_PyObj_FromInt((int)wxSPLASH_CENTRE_ON_SCREEN)); + PyDict_SetItemString(d,"SPLASH_NO_CENTRE", SWIG_PyObj_FromInt((int)wxSPLASH_NO_CENTRE)); + PyDict_SetItemString(d,"SPLASH_TIMEOUT", SWIG_PyObj_FromInt((int)wxSPLASH_TIMEOUT)); + PyDict_SetItemString(d,"SPLASH_NO_TIMEOUT", SWIG_PyObj_FromInt((int)wxSPLASH_NO_TIMEOUT)); SWIG_addvarlink(SWIG_globals,(char*)"SplitterNameStr",_wrap_SplitterNameStr_get, _wrap_SplitterNameStr_set); + PyDict_SetItemString(d,"SP_NOBORDER", SWIG_PyObj_FromInt((int)wxSP_NOBORDER)); + PyDict_SetItemString(d,"SP_NOSASH", SWIG_PyObj_FromInt((int)wxSP_NOSASH)); + PyDict_SetItemString(d,"SP_PERMIT_UNSPLIT", SWIG_PyObj_FromInt((int)wxSP_PERMIT_UNSPLIT)); + PyDict_SetItemString(d,"SP_LIVE_UPDATE", SWIG_PyObj_FromInt((int)wxSP_LIVE_UPDATE)); + PyDict_SetItemString(d,"SP_3DSASH", SWIG_PyObj_FromInt((int)wxSP_3DSASH)); + PyDict_SetItemString(d,"SP_3DBORDER", SWIG_PyObj_FromInt((int)wxSP_3DBORDER)); + PyDict_SetItemString(d,"SP_BORDER", SWIG_PyObj_FromInt((int)wxSP_BORDER)); + PyDict_SetItemString(d,"SP_3D", SWIG_PyObj_FromInt((int)wxSP_3D)); + PyDict_SetItemString(d,"SPLIT_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSPLIT_HORIZONTAL)); + PyDict_SetItemString(d,"SPLIT_VERTICAL", SWIG_PyObj_FromInt((int)wxSPLIT_VERTICAL)); + PyDict_SetItemString(d,"SPLIT_DRAG_NONE", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_NONE)); + PyDict_SetItemString(d,"SPLIT_DRAG_DRAGGING", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_DRAGGING)); + PyDict_SetItemString(d,"SPLIT_DRAG_LEFT_DOWN", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_LEFT_DOWN)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_UNSPLIT)); SWIG_addvarlink(SWIG_globals,(char*)"SashNameStr",_wrap_SashNameStr_get, _wrap_SashNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"SashLayoutNameStr",_wrap_SashLayoutNameStr_get, _wrap_SashLayoutNameStr_set); + PyDict_SetItemString(d,"SASH_DRAG_NONE", SWIG_PyObj_FromInt((int)wxSASH_DRAG_NONE)); + PyDict_SetItemString(d,"SASH_DRAG_DRAGGING", SWIG_PyObj_FromInt((int)wxSASH_DRAG_DRAGGING)); + PyDict_SetItemString(d,"SASH_DRAG_LEFT_DOWN", SWIG_PyObj_FromInt((int)wxSASH_DRAG_LEFT_DOWN)); + PyDict_SetItemString(d,"SW_NOBORDER", SWIG_PyObj_FromInt((int)wxSW_NOBORDER)); + PyDict_SetItemString(d,"SW_BORDER", SWIG_PyObj_FromInt((int)wxSW_BORDER)); + PyDict_SetItemString(d,"SW_3DSASH", SWIG_PyObj_FromInt((int)wxSW_3DSASH)); + PyDict_SetItemString(d,"SW_3DBORDER", SWIG_PyObj_FromInt((int)wxSW_3DBORDER)); + PyDict_SetItemString(d,"SW_3D", SWIG_PyObj_FromInt((int)wxSW_3D)); + PyDict_SetItemString(d,"SASH_TOP", SWIG_PyObj_FromInt((int)wxSASH_TOP)); + PyDict_SetItemString(d,"SASH_RIGHT", SWIG_PyObj_FromInt((int)wxSASH_RIGHT)); + PyDict_SetItemString(d,"SASH_BOTTOM", SWIG_PyObj_FromInt((int)wxSASH_BOTTOM)); + PyDict_SetItemString(d,"SASH_LEFT", SWIG_PyObj_FromInt((int)wxSASH_LEFT)); + PyDict_SetItemString(d,"SASH_NONE", SWIG_PyObj_FromInt((int)wxSASH_NONE)); + PyDict_SetItemString(d,"SASH_STATUS_OK", SWIG_PyObj_FromInt((int)wxSASH_STATUS_OK)); + PyDict_SetItemString(d,"SASH_STATUS_OUT_OF_RANGE", SWIG_PyObj_FromInt((int)wxSASH_STATUS_OUT_OF_RANGE)); PyDict_SetItemString(d, "wxEVT_SASH_DRAGGED", PyInt_FromLong(wxEVT_SASH_DRAGGED)); + PyDict_SetItemString(d,"LAYOUT_HORIZONTAL", SWIG_PyObj_FromInt((int)wxLAYOUT_HORIZONTAL)); + PyDict_SetItemString(d,"LAYOUT_VERTICAL", SWIG_PyObj_FromInt((int)wxLAYOUT_VERTICAL)); + PyDict_SetItemString(d,"LAYOUT_NONE", SWIG_PyObj_FromInt((int)wxLAYOUT_NONE)); + PyDict_SetItemString(d,"LAYOUT_TOP", SWIG_PyObj_FromInt((int)wxLAYOUT_TOP)); + PyDict_SetItemString(d,"LAYOUT_LEFT", SWIG_PyObj_FromInt((int)wxLAYOUT_LEFT)); + PyDict_SetItemString(d,"LAYOUT_RIGHT", SWIG_PyObj_FromInt((int)wxLAYOUT_RIGHT)); + PyDict_SetItemString(d,"LAYOUT_BOTTOM", SWIG_PyObj_FromInt((int)wxLAYOUT_BOTTOM)); + PyDict_SetItemString(d,"LAYOUT_LENGTH_Y", SWIG_PyObj_FromInt((int)wxLAYOUT_LENGTH_Y)); + PyDict_SetItemString(d,"LAYOUT_LENGTH_X", SWIG_PyObj_FromInt((int)wxLAYOUT_LENGTH_X)); + PyDict_SetItemString(d,"LAYOUT_MRU_LENGTH", SWIG_PyObj_FromInt((int)wxLAYOUT_MRU_LENGTH)); + PyDict_SetItemString(d,"LAYOUT_QUERY", SWIG_PyObj_FromInt((int)wxLAYOUT_QUERY)); PyDict_SetItemString(d, "wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong(wxEVT_QUERY_LAYOUT_INFO)); PyDict_SetItemString(d, "wxEVT_CALCULATE_LAYOUT", PyInt_FromLong(wxEVT_CALCULATE_LAYOUT)); SWIG_addvarlink(SWIG_globals,(char*)"VListBoxNameStr",_wrap_VListBoxNameStr_get, _wrap_VListBoxNameStr_set); @@ -23359,13 +24719,52 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set); SWIG_addvarlink(SWIG_globals,(char*)"GetTextFromUserPromptStr",_wrap_GetTextFromUserPromptStr_get, _wrap_GetTextFromUserPromptStr_set); SWIG_addvarlink(SWIG_globals,(char*)"MessageBoxCaptionStr",_wrap_MessageBoxCaptionStr_get, _wrap_MessageBoxCaptionStr_set); + PyDict_SetItemString(d,"CHOICEDLG_STYLE", SWIG_PyObj_FromInt((int)wxCHOICEDLG_STYLE)); + PyDict_SetItemString(d,"FR_DOWN", SWIG_PyObj_FromInt((int)wxFR_DOWN)); + PyDict_SetItemString(d,"FR_WHOLEWORD", SWIG_PyObj_FromInt((int)wxFR_WHOLEWORD)); + PyDict_SetItemString(d,"FR_MATCHCASE", SWIG_PyObj_FromInt((int)wxFR_MATCHCASE)); + PyDict_SetItemString(d,"FR_REPLACEDIALOG", SWIG_PyObj_FromInt((int)wxFR_REPLACEDIALOG)); + PyDict_SetItemString(d,"FR_NOUPDOWN", SWIG_PyObj_FromInt((int)wxFR_NOUPDOWN)); + PyDict_SetItemString(d,"FR_NOMATCHCASE", SWIG_PyObj_FromInt((int)wxFR_NOMATCHCASE)); + PyDict_SetItemString(d,"FR_NOWHOLEWORD", SWIG_PyObj_FromInt((int)wxFR_NOWHOLEWORD)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND", PyInt_FromLong(wxEVT_COMMAND_FIND)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_NEXT", PyInt_FromLong(wxEVT_COMMAND_FIND_NEXT)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_REPLACE", PyInt_FromLong(wxEVT_COMMAND_FIND_REPLACE)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_REPLACE_ALL", PyInt_FromLong(wxEVT_COMMAND_FIND_REPLACE_ALL)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_CLOSE", PyInt_FromLong(wxEVT_COMMAND_FIND_CLOSE)); + PyDict_SetItemString(d,"IDM_WINDOWTILE", SWIG_PyObj_FromInt((int)4001)); + PyDict_SetItemString(d,"IDM_WINDOWTILEHOR", SWIG_PyObj_FromInt((int)4001)); + PyDict_SetItemString(d,"IDM_WINDOWCASCADE", SWIG_PyObj_FromInt((int)4002)); + PyDict_SetItemString(d,"IDM_WINDOWICONS", SWIG_PyObj_FromInt((int)4003)); + PyDict_SetItemString(d,"IDM_WINDOWNEXT", SWIG_PyObj_FromInt((int)4004)); + PyDict_SetItemString(d,"IDM_WINDOWTILEVERT", SWIG_PyObj_FromInt((int)4005)); + PyDict_SetItemString(d,"FIRST_MDI_CHILD", SWIG_PyObj_FromInt((int)4100)); + PyDict_SetItemString(d,"LAST_MDI_CHILD", SWIG_PyObj_FromInt((int)4600)); SWIG_addvarlink(SWIG_globals,(char*)"PrintoutTitleStr",_wrap_PrintoutTitleStr_get, _wrap_PrintoutTitleStr_set); SWIG_addvarlink(SWIG_globals,(char*)"PreviewCanvasNameStr",_wrap_PreviewCanvasNameStr_get, _wrap_PreviewCanvasNameStr_set); + PyDict_SetItemString(d,"PRINT_MODE_NONE", SWIG_PyObj_FromInt((int)wxPRINT_MODE_NONE)); + PyDict_SetItemString(d,"PRINT_MODE_PREVIEW", SWIG_PyObj_FromInt((int)wxPRINT_MODE_PREVIEW)); + PyDict_SetItemString(d,"PRINT_MODE_FILE", SWIG_PyObj_FromInt((int)wxPRINT_MODE_FILE)); + PyDict_SetItemString(d,"PRINT_MODE_PRINTER", SWIG_PyObj_FromInt((int)wxPRINT_MODE_PRINTER)); + PyDict_SetItemString(d,"PRINTER_NO_ERROR", SWIG_PyObj_FromInt((int)wxPRINTER_NO_ERROR)); + PyDict_SetItemString(d,"PRINTER_CANCELLED", SWIG_PyObj_FromInt((int)wxPRINTER_CANCELLED)); + PyDict_SetItemString(d,"PRINTER_ERROR", SWIG_PyObj_FromInt((int)wxPRINTER_ERROR)); + PyDict_SetItemString(d,"PREVIEW_PRINT", SWIG_PyObj_FromInt((int)wxPREVIEW_PRINT)); + PyDict_SetItemString(d,"PREVIEW_PREVIOUS", SWIG_PyObj_FromInt((int)wxPREVIEW_PREVIOUS)); + PyDict_SetItemString(d,"PREVIEW_NEXT", SWIG_PyObj_FromInt((int)wxPREVIEW_NEXT)); + PyDict_SetItemString(d,"PREVIEW_ZOOM", SWIG_PyObj_FromInt((int)wxPREVIEW_ZOOM)); + PyDict_SetItemString(d,"PREVIEW_FIRST", SWIG_PyObj_FromInt((int)wxPREVIEW_FIRST)); + PyDict_SetItemString(d,"PREVIEW_LAST", SWIG_PyObj_FromInt((int)wxPREVIEW_LAST)); + PyDict_SetItemString(d,"PREVIEW_GOTO", SWIG_PyObj_FromInt((int)wxPREVIEW_GOTO)); + PyDict_SetItemString(d,"PREVIEW_DEFAULT", SWIG_PyObj_FromInt((int)wxPREVIEW_DEFAULT)); + PyDict_SetItemString(d,"ID_PREVIEW_CLOSE", SWIG_PyObj_FromInt((int)wxID_PREVIEW_CLOSE)); + PyDict_SetItemString(d,"ID_PREVIEW_NEXT", SWIG_PyObj_FromInt((int)wxID_PREVIEW_NEXT)); + PyDict_SetItemString(d,"ID_PREVIEW_PREVIOUS", SWIG_PyObj_FromInt((int)wxID_PREVIEW_PREVIOUS)); + PyDict_SetItemString(d,"ID_PREVIEW_PRINT", SWIG_PyObj_FromInt((int)wxID_PREVIEW_PRINT)); + PyDict_SetItemString(d,"ID_PREVIEW_ZOOM", SWIG_PyObj_FromInt((int)wxID_PREVIEW_ZOOM)); + PyDict_SetItemString(d,"ID_PREVIEW_FIRST", SWIG_PyObj_FromInt((int)wxID_PREVIEW_FIRST)); + PyDict_SetItemString(d,"ID_PREVIEW_LAST", SWIG_PyObj_FromInt((int)wxID_PREVIEW_LAST)); + PyDict_SetItemString(d,"ID_PREVIEW_GOTO", SWIG_PyObj_FromInt((int)wxID_PREVIEW_GOTO)); wxPyPtrTypeMap_Add("wxPrintout", "wxPyPrintout"); diff --git a/wxPython/src/msw/wizard_wrap.cpp b/wxPython/src/msw/wizard_wrap.cpp index 6c6633cf71..09657e53e6 100644 --- a/wxPython/src/msw/wizard_wrap.cpp +++ b/wxPython/src/msw/wizard_wrap.cpp @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -137,178 +136,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 +184,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); @@ -367,6 +195,27 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ @@ -392,15 +241,16 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxCommandEvent swig_types[8] #define SWIGTYPE_p_wxBitmap swig_types[9] #define SWIGTYPE_p_wxWizard swig_types[10] -#define SWIGTYPE_p_wxString swig_types[11] +#define SWIGTYPE_p_char swig_types[11] #define SWIGTYPE_p_wxEvtHandler swig_types[12] -#define SWIGTYPE_p_wxNotifyEvent swig_types[13] -#define SWIGTYPE_p_wxPanel swig_types[14] -#define SWIGTYPE_p_wxEvent swig_types[15] -#define SWIGTYPE_p_wxSize swig_types[16] -#define SWIGTYPE_p_wxChar swig_types[17] -#define SWIGTYPE_p_int swig_types[18] -static swig_type_info *swig_types[20]; +#define SWIGTYPE_p_wxString swig_types[13] +#define SWIGTYPE_p_wxNotifyEvent swig_types[14] +#define SWIGTYPE_p_wxPanel swig_types[15] +#define SWIGTYPE_p_wxEvent swig_types[16] +#define SWIGTYPE_p_wxSize swig_types[17] +#define SWIGTYPE_p_wxChar swig_types[18] +#define SWIGTYPE_p_int swig_types[19] +static swig_type_info *swig_types[21]; /* -------- TYPES TABLE (END) -------- */ @@ -412,6 +262,44 @@ static swig_type_info *swig_types[20]; #define SWIG_name "_wizard" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/printfw.h" @@ -420,6 +308,30 @@ static swig_type_info *swig_types[20]; static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(PyObject*) +SWIG_PyObj_FromBool(bool value) +{ + PyObject *obj = value ? Py_True : Py_False; + Py_INCREF(obj); + return obj; +} + bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap,wxString const &resource){ wxChar* res = NULL; if (resource.Length()) @@ -538,6 +450,13 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + #ifdef __cplusplus extern "C" { #endif @@ -548,16 +467,30 @@ static PyObject *_wrap_new_WizardEvent(PyObject *self, PyObject *args, PyObject bool arg3 = (bool) True ; wxWizardPage *arg4 = (wxWizardPage *) NULL ; wxWizardEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "type",(char *) "id",(char *) "direction",(char *) "page", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiOO:new_WizardEvent",kwnames,&arg1,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_WizardEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -596,7 +529,7 @@ static PyObject *_wrap_WizardEvent_GetDirection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -678,7 +611,7 @@ static PyObject *_wrap_WizardPage_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -894,7 +827,7 @@ static PyObject *_wrap_PyWizardPage_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -947,12 +880,32 @@ static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *self, PyObject * int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyWizardPage_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWizardPage_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -976,12 +929,39 @@ static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *self, PyObject *arg int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyWizardPage_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWizardPage_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -1002,12 +982,22 @@ static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *self, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyWizardPage_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -1028,12 +1018,22 @@ static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *self, PyObje int arg2 ; int 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 *)"Oii:PyWizardPage_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -1262,7 +1262,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1287,7 +1287,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1312,7 +1312,7 @@ static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1337,7 +1337,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1362,7 +1362,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *self wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1577,7 +1577,7 @@ static PyObject *_wrap_WizardPageSimple_Create(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -1687,15 +1687,23 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar bool temp3 = False ; wxPoint temp5 ; 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 *) "title",(char *) "bitmap",(char *) "pos",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOOl:new_Wizard",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Wizard",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = wxString_in_helper(obj2); @@ -1715,6 +1723,12 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWizard *)new wxWizard(arg1,arg2,(wxString const &)*arg3,(wxBitmap const &)*arg4,(wxPoint const &)*arg5,arg6); @@ -1775,6 +1789,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k wxPoint temp6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; @@ -1782,9 +1797,15 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "parent",(char *) "id",(char *) "title",(char *) "bitmap",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOO:Wizard_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Wizard_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWizard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); @@ -1811,7 +1832,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); { if (temp4) delete arg4; @@ -1871,7 +1892,7 @@ static PyObject *_wrap_Wizard_RunWizard(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2024,12 +2045,17 @@ static PyObject *_wrap_Wizard_SetBorder(PyObject *self, PyObject *args, PyObject wxWizard *arg1 = (wxWizard *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Wizard_SetBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Wizard_SetBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWizard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorder(arg2); @@ -2062,7 +2088,7 @@ static PyObject *_wrap_Wizard_IsRunning(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2087,7 +2113,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWizardPage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { - arg3 = (bool) SPyObj_AsBool(obj2); + arg3 = (bool) SWIG_PyObj_AsBool(obj2); if (PyErr_Occurred()) SWIG_fail; } } @@ -2098,7 +2124,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2126,7 +2152,7 @@ static PyObject *_wrap_Wizard_HasNextPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -2154,7 +2180,7 @@ static PyObject *_wrap_Wizard_HasPrevPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromBool((bool)result); return resultobj; fail: return NULL; @@ -3255,8 +3281,9 @@ static swig_type_info _swigt__p_wxWizardEvent[] = {{"_p_wxWizardEvent", 0, "wxWi static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxWizardEvent", _p_wxWizardEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxCommandEvent},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxWizard[] = {{"_p_wxWizard", 0, "wxWizard *", 0},{"_p_wxWizard"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxWizardPage", _p_wxWizardPageTo_p_wxEvtHandler},{"_p_wxPyWizardPage", _p_wxPyWizardPageTo_p_wxEvtHandler},{"_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_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_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_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_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_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_wxWizard", _p_wxWizardTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxWizardPageSimple", _p_wxWizardPageSimpleTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_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_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{0}}; +static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxNotifyEvent},{"_p_wxNotifyEvent"},{"_p_wxWizardEvent", _p_wxWizardEventTo_p_wxNotifyEvent},{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_wxWizardPageSimple", _p_wxWizardPageSimpleTo_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_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{"_p_wxWizardPage", _p_wxWizardPageTo_p_wxPanel},{"_p_wxPyWizardPage", _p_wxPyWizardPageTo_p_wxPanel},{0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxEvent},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxWizardEvent", _p_wxWizardEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxEvent},{0}}; @@ -3276,8 +3303,9 @@ _swigt__p_wxWizardEvent, _swigt__p_wxCommandEvent, _swigt__p_wxBitmap, _swigt__p_wxWizard, -_swigt__p_wxString, +_swigt__p_char, _swigt__p_wxEvtHandler, +_swigt__p_wxString, _swigt__p_wxNotifyEvent, _swigt__p_wxPanel, _swigt__p_wxEvent, @@ -3291,12 +3319,6 @@ _swigt__p_int, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"WIZARD_EX_HELPBUTTON", (long) wxWIZARD_EX_HELPBUTTON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_PAGE_CHANGED", (long) wxEVT_WIZARD_PAGE_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_PAGE_CHANGING", (long) wxEVT_WIZARD_PAGE_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_CANCEL", (long) wxEVT_WIZARD_CANCEL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_HELP", (long) wxEVT_WIZARD_HELP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_WIZARD_FINISHED", (long) wxEVT_WIZARD_FINISHED, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -3323,6 +3345,7 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"WIZARD_EX_HELPBUTTON", SWIG_PyObj_FromInt((int)wxWIZARD_EX_HELPBUTTON)); PyDict_SetItemString(d, "wxEVT_WIZARD_PAGE_CHANGED", PyInt_FromLong(wxEVT_WIZARD_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_WIZARD_PAGE_CHANGING", PyInt_FromLong(wxEVT_WIZARD_PAGE_CHANGING)); PyDict_SetItemString(d, "wxEVT_WIZARD_CANCEL", PyInt_FromLong(wxEVT_WIZARD_CANCEL)); -- 2.45.2