X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb9b610777c40c1bb8f23b4443d9524024971c36..b88bce5f07e0359732245ea77d1e59a8794f9bef:/wxPython/src/msw/controls_wrap.cpp diff --git a/wxPython/src/msw/controls_wrap.cpp b/wxPython/src/msw/controls_wrap.cpp index db3ed88042..09ecb3cd82 100644 --- a/wxPython/src/msw/controls_wrap.cpp +++ b/wxPython/src/msw/controls_wrap.cpp @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3.20 + * Version 1.3.22 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -121,7 +121,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } - #endif @@ -172,7 +171,7 @@ typedef struct swig_const_info { SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) \ SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_newvarlink() \ SWIG_Python_newvarlink() @@ -185,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); @@ -195,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 */ @@ -212,56 +233,56 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxTextUrlEvent swig_types[0] #define SWIGTYPE_p_wxBookCtrlEvent swig_types[1] #define SWIGTYPE_p_wxSizer swig_types[2] -#define SWIGTYPE_p_wxTreeItemIdValue swig_types[3] -#define SWIGTYPE_wxTreeItemIdValue swig_types[4] -#define SWIGTYPE_p_wxCheckBox swig_types[5] -#define SWIGTYPE_p_wxPyTreeCtrl swig_types[6] -#define SWIGTYPE_p_wxEvent swig_types[7] -#define SWIGTYPE_p_wxGenericDirCtrl swig_types[8] -#define SWIGTYPE_p_bool swig_types[9] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[10] -#define SWIGTYPE_p_wxItemContainer swig_types[11] -#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[12] -#define SWIGTYPE_p_wxPyListCtrl swig_types[13] -#define SWIGTYPE_p_wxStaticLine swig_types[14] -#define SWIGTYPE_p_wxControl swig_types[15] -#define SWIGTYPE_p_wxPyControl swig_types[16] -#define SWIGTYPE_p_wxGauge swig_types[17] -#define SWIGTYPE_p_wxToolBarBase swig_types[18] -#define SWIGTYPE_p_wxFont swig_types[19] -#define SWIGTYPE_p_wxToggleButton swig_types[20] -#define SWIGTYPE_p_wxRadioButton swig_types[21] -#define SWIGTYPE_p_wxChoice swig_types[22] -#define SWIGTYPE_p_wxMemoryDC swig_types[23] -#define SWIGTYPE_p_wxListItemAttr swig_types[24] -#define SWIGTYPE_p_int swig_types[25] -#define SWIGTYPE_p_wxSize swig_types[26] -#define SWIGTYPE_p_wxDC swig_types[27] -#define SWIGTYPE_p_wxListView swig_types[28] -#define SWIGTYPE_p_wxIcon swig_types[29] -#define SWIGTYPE_p_wxTextCtrl swig_types[30] -#define SWIGTYPE_p_wxNotebook swig_types[31] -#define SWIGTYPE_p_wxNotifyEvent swig_types[32] -#define SWIGTYPE_p_wxArrayString swig_types[33] -#define SWIGTYPE_p_wxListbook swig_types[34] -#define SWIGTYPE_p_wxStaticBitmap swig_types[35] -#define SWIGTYPE_p_wxSlider swig_types[36] -#define SWIGTYPE_p_wxStaticBox swig_types[37] -#define SWIGTYPE_p_wxArrayInt swig_types[38] -#define SWIGTYPE_p_wxContextHelp swig_types[39] -#define SWIGTYPE_p_long swig_types[40] -#define SWIGTYPE_p_wxEvtHandler swig_types[41] -#define SWIGTYPE_p_wxListEvent swig_types[42] -#define SWIGTYPE_p_wxListBox swig_types[43] -#define SWIGTYPE_p_wxCheckListBox swig_types[44] -#define SWIGTYPE_p_wxBookCtrl swig_types[45] -#define SWIGTYPE_p_wxSpinButton swig_types[46] -#define SWIGTYPE_p_wxButton swig_types[47] -#define SWIGTYPE_p_wxBitmapButton swig_types[48] -#define SWIGTYPE_p_wxRect swig_types[49] -#define SWIGTYPE_p_wxContextHelpButton swig_types[50] -#define SWIGTYPE_p_wxRadioBox swig_types[51] -#define SWIGTYPE_p_wxScrollBar swig_types[52] +#define SWIGTYPE_p_wxCheckBox swig_types[3] +#define SWIGTYPE_p_wxPyTreeCtrl swig_types[4] +#define SWIGTYPE_p_wxEvent swig_types[5] +#define SWIGTYPE_p_wxGenericDirCtrl swig_types[6] +#define SWIGTYPE_p_bool swig_types[7] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[8] +#define SWIGTYPE_p_wxItemContainer swig_types[9] +#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[10] +#define SWIGTYPE_p_wxPyListCtrl swig_types[11] +#define SWIGTYPE_p_wxStaticLine swig_types[12] +#define SWIGTYPE_p_wxControl swig_types[13] +#define SWIGTYPE_p_wxPyControl swig_types[14] +#define SWIGTYPE_p_wxGauge swig_types[15] +#define SWIGTYPE_p_wxToolBarBase swig_types[16] +#define SWIGTYPE_p_wxFont swig_types[17] +#define SWIGTYPE_p_wxToggleButton swig_types[18] +#define SWIGTYPE_p_wxRadioButton swig_types[19] +#define SWIGTYPE_p_wxChoice swig_types[20] +#define SWIGTYPE_p_wxMemoryDC swig_types[21] +#define SWIGTYPE_p_wxListItemAttr swig_types[22] +#define SWIGTYPE_p_void swig_types[23] +#define SWIGTYPE_p_int swig_types[24] +#define SWIGTYPE_p_wxSize swig_types[25] +#define SWIGTYPE_p_wxDC swig_types[26] +#define SWIGTYPE_p_wxListView swig_types[27] +#define SWIGTYPE_p_wxIcon swig_types[28] +#define SWIGTYPE_p_wxTextCtrl swig_types[29] +#define SWIGTYPE_p_wxNotebook swig_types[30] +#define SWIGTYPE_p_wxNotifyEvent swig_types[31] +#define SWIGTYPE_p_wxArrayString swig_types[32] +#define SWIGTYPE_p_wxListbook swig_types[33] +#define SWIGTYPE_p_wxStaticBitmap swig_types[34] +#define SWIGTYPE_p_wxSlider swig_types[35] +#define SWIGTYPE_p_wxStaticBox swig_types[36] +#define SWIGTYPE_p_wxArrayInt swig_types[37] +#define SWIGTYPE_p_wxContextHelp swig_types[38] +#define SWIGTYPE_p_long swig_types[39] +#define SWIGTYPE_p_wxEvtHandler swig_types[40] +#define SWIGTYPE_p_wxListEvent swig_types[41] +#define SWIGTYPE_p_wxListBox swig_types[42] +#define SWIGTYPE_p_wxCheckListBox swig_types[43] +#define SWIGTYPE_p_wxBookCtrl swig_types[44] +#define SWIGTYPE_p_wxSpinButton swig_types[45] +#define SWIGTYPE_p_wxButton swig_types[46] +#define SWIGTYPE_p_wxBitmapButton swig_types[47] +#define SWIGTYPE_p_wxRect swig_types[48] +#define SWIGTYPE_p_wxContextHelpButton swig_types[49] +#define SWIGTYPE_p_wxRadioBox swig_types[50] +#define SWIGTYPE_p_wxScrollBar swig_types[51] +#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] @@ -305,14 +326,77 @@ static swig_type_info *swig_types[85]; #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" static const wxString wxPyPanelNameStr(wxPanelNameStr); static const wxString wxPyEmptyString(wxEmptyString); static const wxString wxPyControlNameStr(wxControlNameStr); + + const wxArrayString wxPyEmptyStringArray; + 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); +} + 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); @@ -340,6 +424,24 @@ PyObject *wxListBox_GetSelections(wxListBox *self){ } return tup; } +void wxListBox_SetItemForegroundColour(wxListBox *self,int item,wxColour const &c){ + #ifdef __WXMSW__ + if (self->GetWindowStyle() & wxLB_OWNERDRAW) + self->GetItem(item)->SetTextColour(c); + #endif + } +void wxListBox_SetItemBackgroundColour(wxListBox *self,int item,wxColour const &c){ + #ifdef __WXMSW__ + if (self->GetWindowStyle() & wxLB_OWNERDRAW) + self->GetItem(item)->SetBackgroundColour(c); + #endif + } +void wxListBox_SetItemFont(wxListBox *self,int item,wxFont const &f){ + #ifdef __WXMSW__ + if (self->GetWindowStyle() & wxLB_OWNERDRAW) + self->GetItem(item)->SetFont(f); + #endif + } static const wxString wxPyTextCtrlNameStr(wxTextCtrlNameStr); static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -405,6 +507,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(); @@ -610,6 +720,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) { @@ -656,21 +777,21 @@ PyObject *wxPyTreeCtrl_GetSelections(wxPyTreeCtrl *self){ return rval; } PyObject *wxPyTreeCtrl_GetFirstChild(wxPyTreeCtrl *self,wxTreeItemId const &item){ - wxTreeItemIdValue cookie = 0; - wxTreeItemId ritem = self->GetFirstChild(item, cookie); + void* cookie = 0; + wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie)); wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); - PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(); return tup; } -PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,wxTreeItemIdValue &cookie){ - wxTreeItemId ritem = self->GetNextChild(item, cookie); +PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,void *cookie){ + wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie)); wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); - PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(); return tup; } @@ -765,7 +886,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; } @@ -805,17 +926,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; @@ -833,6 +960,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) { @@ -924,18 +1057,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; @@ -953,6 +1092,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) { @@ -973,7 +1118,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 = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -1020,62 +1165,6 @@ static PyObject *_wrap_Button_SetDefault(PyObject *self, PyObject *args, PyObjec } -static PyObject *_wrap_Button_SetImageLabel(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxButton *arg1 = (wxButton *) 0 ; - wxBitmap *arg2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "bitmap", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Button_SetImageLabel",kwnames,&obj0,&obj1)) 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_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetImageLabel((wxBitmap const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Button_SetImageMargins(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxButton *arg1 = (wxButton *) 0 ; - int arg2 ; - int arg3 ; - PyObject * obj0 = 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 ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxButton,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetImageMargins(arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Button_GetDefaultSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSize result; @@ -1128,17 +1217,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; @@ -1155,6 +1250,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) { @@ -1237,18 +1338,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; @@ -1265,6 +1372,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) { @@ -1285,7 +1398,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp9) delete arg9; @@ -1542,12 +1655,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); @@ -1580,7 +1703,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; @@ -1605,7 +1728,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; @@ -1619,7 +1742,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; } @@ -1659,17 +1782,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; @@ -1687,6 +1816,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) { @@ -1774,18 +1909,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; @@ -1803,6 +1944,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) { @@ -1823,7 +1970,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -1864,7 +2011,7 @@ static PyObject *_wrap_CheckBox_GetValue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1889,7 +2036,7 @@ static PyObject *_wrap_CheckBox_IsChecked(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1908,8 +2055,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool const) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -1942,7 +2091,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; @@ -1954,12 +2103,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); @@ -1992,7 +2146,7 @@ static PyObject *_wrap_CheckBox_Is3State(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2017,7 +2171,7 @@ static PyObject *_wrap_CheckBox_Is3rdStateAllowedForUser(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2031,7 +2185,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; } @@ -2059,29 +2213,36 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - int arg5 = (int) 0 ; - wxString *arg6 = (wxString *) NULL ; - long arg7 = (long) 0 ; - wxValidator const &arg8_defvalue = wxDefaultValidator ; - wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; - wxString const &arg9_defvalue = wxPyChoiceNameStr ; - wxString *arg9 = (wxString *) &arg9_defvalue ; + wxArrayString const &arg5_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg5 = (wxArrayString *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxValidator const &arg7_defvalue = wxDefaultValidator ; + wxValidator *arg7 = (wxValidator *) &arg7_defvalue ; + wxString const &arg8_defvalue = wxPyChoiceNameStr ; + wxString *arg8 = (wxString *) &arg8_defvalue ; wxChoice *result; wxPoint temp3 ; wxSize temp4 ; + bool temp5 = 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 ; 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; @@ -2096,47 +2257,68 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar } if (obj4) { { - arg5 = PyList_Size(obj4); - arg6 = wxString_LIST_helper(obj4); - if (arg6 == NULL) SWIG_fail; + if (! PySequence_Check(obj4)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg5 = new wxArrayString; + temp5 = True; + int i, len=PySequence_Length(obj4); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj5) { + { + arg6 = (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) { + if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg7 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj7) { { - arg9 = wxString_in_helper(obj7); - if (arg9 == NULL) SWIG_fail; + arg8 = wxString_in_helper(obj7); + if (arg8 == NULL) SWIG_fail; temp8 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoice *)new wxChoice(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); + result = (wxChoice *)new wxChoice(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,(wxArrayString const &)*arg5,arg6,(wxValidator const &)*arg7,(wxString const &)*arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxChoice, 1); { - if (arg6) delete [] arg6; + if (temp5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return resultobj; fail: { - if (arg6) delete [] arg6; + if (temp5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return NULL; } @@ -2173,31 +2355,38 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - long arg8 = (long) 0 ; - wxValidator const &arg9_defvalue = wxDefaultValidator ; - wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; - wxString const &arg10_defvalue = wxPyChoiceNameStr ; - wxString *arg10 = (wxString *) &arg10_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + long arg7 = (long) 0 ; + wxValidator const &arg8_defvalue = wxDefaultValidator ; + wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; + wxString const &arg9_defvalue = wxPyChoiceNameStr ; + wxString *arg9 = (wxString *) &arg9_defvalue ; bool result; wxPoint temp4 ; wxSize temp5 ; + bool temp6 = 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 *) "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; @@ -2212,145 +2401,121 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + temp6 = True; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj6) { + { + arg7 = (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) { + if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg8 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj8) { { - arg10 = wxString_in_helper(obj8); - if (arg10 == NULL) SWIG_fail; + arg9 = wxString_in_helper(obj8); + if (arg9 == NULL) SWIG_fail; temp9 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return resultobj; fail: { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return NULL; } -static PyObject *_wrap_Choice_GetColumns(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Choice_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxChoice *arg1 = (wxChoice *) 0 ; - int result; + int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choice_GetColumns",kwnames,&obj0)) 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(); - result = (int)(arg1)->GetColumns(); + (arg1)->SetSelection(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_Choice_SetColumns(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Choice_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxChoice *arg1 = (wxChoice *) 0 ; - int arg2 = (int) (int)1 ; + wxString *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "n", NULL + (char *) "self",(char *) "string", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Choice_SetColumns",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Choice_SetStringSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetColumns(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Choice_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxChoice *arg1 = (wxChoice *) 0 ; - int arg2 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "n", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Choice_SetSelection",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSelection(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Choice_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxChoice *arg1 = (wxChoice *) 0 ; - wxString *arg2 = 0 ; - bool temp2 = False ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "string", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Choice_SetStringSelection",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxChoice,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = True; - } + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStringSelection((wxString const &)*arg2); @@ -2380,13 +2545,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 + (char *) "self",(char *) "n",(char *) "string", 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; @@ -2421,7 +2591,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; } @@ -2451,31 +2621,38 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - long arg8 = (long) 0 ; - wxValidator const &arg9_defvalue = wxDefaultValidator ; - wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; - wxString const &arg10_defvalue = wxPyComboBoxNameStr ; - wxString *arg10 = (wxString *) &arg10_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + long arg7 = (long) 0 ; + wxValidator const &arg8_defvalue = wxDefaultValidator ; + wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; + wxString const &arg9_defvalue = wxPyComboBoxNameStr ; + wxString *arg9 = (wxString *) &arg9_defvalue ; wxComboBox *result; bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; + bool temp6 = 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 *) "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); @@ -2497,27 +2674,48 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + temp6 = True; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj6) { + { + arg7 = (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) { + if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg8 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj8) { { - arg10 = wxString_in_helper(obj8); - if (arg10 == NULL) SWIG_fail; + arg9 = wxString_in_helper(obj8); + if (arg9 == NULL) SWIG_fail; temp9 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxComboBox *)new wxComboBox(arg1,arg2,(wxString const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); + result = (wxComboBox *)new wxComboBox(arg1,arg2,(wxString const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2528,11 +2726,11 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw delete arg3; } { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return resultobj; fail: @@ -2541,11 +2739,11 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw delete arg3; } { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return NULL; } @@ -2584,33 +2782,40 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; wxSize const &arg6_defvalue = wxDefaultSize ; wxSize *arg6 = (wxSize *) &arg6_defvalue ; - int arg7 = (int) 0 ; - wxString *arg8 = (wxString *) NULL ; - long arg9 = (long) 0 ; - wxValidator const &arg10_defvalue = wxDefaultValidator ; - wxValidator *arg10 = (wxValidator *) &arg10_defvalue ; - wxString const &arg11_defvalue = wxPyComboBoxNameStr ; - wxString *arg11 = (wxString *) &arg11_defvalue ; + wxArrayString const &arg7_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg7 = (wxArrayString *) &arg7_defvalue ; + long arg8 = (long) 0 ; + wxValidator const &arg9_defvalue = wxDefaultValidator ; + wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; + wxString const &arg10_defvalue = wxPyComboBoxNameStr ; + wxString *arg10 = (wxString *) &arg10_defvalue ; bool result; bool temp4 = False ; wxPoint temp5 ; wxSize temp6 ; + bool temp7 = False ; 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); @@ -2632,42 +2837,63 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject } if (obj6) { { - arg7 = PyList_Size(obj6); - arg8 = wxString_LIST_helper(obj6); - if (arg8 == NULL) SWIG_fail; + if (! PySequence_Check(obj6)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg7 = new wxArrayString; + temp7 = True; + int i, len=PySequence_Length(obj6); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj7) { + { + arg8 = (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) { + if ((SWIG_ConvertPtr(obj8,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg9 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj9) { { - arg11 = wxString_in_helper(obj9); - if (arg11 == NULL) SWIG_fail; + arg10 = wxString_in_helper(obj9); + if (arg10 == NULL) SWIG_fail; temp10 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,arg7,arg8,arg9,(wxValidator const &)*arg10,(wxString const &)*arg11); + result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,(wxArrayString const &)*arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; } { - if (arg8) delete [] arg8; + if (temp7) delete arg7; } { if (temp10) - delete arg11; + delete arg10; } return resultobj; fail: @@ -2676,11 +2902,11 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject delete arg4; } { - if (arg8) delete [] arg8; + if (temp7) delete arg7; } { if (temp10) - delete arg11; + delete arg10; } return NULL; } @@ -2834,12 +3060,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); @@ -2872,7 +3103,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; @@ -2897,7 +3128,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; @@ -2912,13 +3143,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; @@ -2951,12 +3192,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); @@ -2977,12 +3223,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); @@ -3009,8 +3265,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEditable(arg2); @@ -3055,12 +3313,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); @@ -3082,7 +3350,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; } @@ -3121,16 +3389,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; @@ -3143,6 +3422,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) { @@ -3221,17 +3506,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; @@ -3244,6 +3540,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) { @@ -3264,7 +3566,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 = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp9) delete arg9; @@ -3284,12 +3586,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); @@ -3322,7 +3629,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; @@ -3334,12 +3641,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); @@ -3372,7 +3684,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; @@ -3397,7 +3709,7 @@ static PyObject *_wrap_Gauge_IsVertical(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3409,12 +3721,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); @@ -3447,7 +3764,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; @@ -3459,12 +3776,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); @@ -3497,7 +3819,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; @@ -3511,7 +3833,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; } @@ -3531,7 +3853,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; } @@ -3551,7 +3873,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; } @@ -3589,16 +3911,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; @@ -3616,6 +3944,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); @@ -3699,17 +4033,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; @@ -3727,6 +4067,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); @@ -3741,7 +4087,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -3787,15 +4133,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; @@ -3808,6 +4160,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); @@ -3877,16 +4235,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; @@ -3899,6 +4263,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); @@ -3913,7 +4283,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -3946,7 +4316,7 @@ static PyObject *_wrap_StaticLine_IsVertical(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3968,7 +4338,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; @@ -4000,16 +4370,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; @@ -4027,6 +4403,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); @@ -4106,19 +4488,25 @@ 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; { - arg4 = wxString_in_helper(obj3); + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; temp4 = True; } @@ -4134,6 +4522,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); @@ -4148,7 +4542,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -4195,16 +4589,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; @@ -4221,6 +4621,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); @@ -4291,17 +4697,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; @@ -4318,6 +4730,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); @@ -4332,7 +4750,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -4443,7 +4861,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; } @@ -4471,29 +4889,36 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - int arg5 = (int) 0 ; - wxString *arg6 = (wxString *) NULL ; - long arg7 = (long) 0 ; - wxValidator const &arg8_defvalue = wxDefaultValidator ; - wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; - wxString const &arg9_defvalue = wxPyListBoxNameStr ; - wxString *arg9 = (wxString *) &arg9_defvalue ; + wxArrayString const &arg5_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg5 = (wxArrayString *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxValidator const &arg7_defvalue = wxDefaultValidator ; + wxValidator *arg7 = (wxValidator *) &arg7_defvalue ; + wxString const &arg8_defvalue = wxPyListBoxNameStr ; + wxString *arg8 = (wxString *) &arg8_defvalue ; wxListBox *result; wxPoint temp3 ; wxSize temp4 ; + bool temp5 = 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 ; 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; @@ -4508,47 +4933,68 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa } if (obj4) { { - arg5 = PyList_Size(obj4); - arg6 = wxString_LIST_helper(obj4); - if (arg6 == NULL) SWIG_fail; + if (! PySequence_Check(obj4)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg5 = new wxArrayString; + temp5 = True; + int i, len=PySequence_Length(obj4); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj5) { + { + arg6 = (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) { + if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg7 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj7) { { - arg9 = wxString_in_helper(obj7); - if (arg9 == NULL) SWIG_fail; + arg8 = wxString_in_helper(obj7); + if (arg8 == NULL) SWIG_fail; temp8 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxListBox *)new wxListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); + result = (wxListBox *)new wxListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,(wxArrayString const &)*arg5,arg6,(wxValidator const &)*arg7,(wxString const &)*arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxListBox, 1); { - if (arg6) delete [] arg6; + if (temp5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return resultobj; fail: { - if (arg6) delete [] arg6; + if (temp5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return NULL; } @@ -4585,31 +5031,38 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - long arg8 = (long) 0 ; - wxValidator const &arg9_defvalue = wxDefaultValidator ; - wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; - wxString const &arg10_defvalue = wxPyListBoxNameStr ; - wxString *arg10 = (wxString *) &arg10_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + long arg7 = (long) 0 ; + wxValidator const &arg8_defvalue = wxDefaultValidator ; + wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; + wxString const &arg9_defvalue = wxPyListBoxNameStr ; + wxString *arg9 = (wxString *) &arg9_defvalue ; bool result; wxPoint temp4 ; wxSize temp5 ; + bool temp6 = 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 *) "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; @@ -4624,47 +5077,68 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + temp6 = True; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj6) { + { + arg7 = (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) { + if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg8 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj8) { { - arg10 = wxString_in_helper(obj8); - if (arg10 == NULL) SWIG_fail; + arg9 = wxString_in_helper(obj8); + if (arg9 == NULL) SWIG_fail; temp9 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return resultobj; fail: { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return NULL; } @@ -4679,18 +5153,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; } @@ -4721,13 +5200,15 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj wxListBox *arg1 = (wxListBox *) 0 ; wxArrayString *arg2 = 0 ; int arg3 ; + bool temp2 = False ; 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)) { @@ -4735,6 +5216,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj SWIG_fail; } arg2 = new wxArrayString; + temp2 = True; int i, len=PySequence_Length(obj1); for (i=0; iInsertItems((wxArrayString const &)*arg2,arg3); @@ -4757,12 +5243,12 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj } Py_INCREF(Py_None); resultobj = Py_None; { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -4772,6 +5258,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa PyObject *resultobj; wxListBox *arg1 = (wxListBox *) 0 ; wxArrayString *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -4786,6 +5273,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa SWIG_fail; } arg2 = new wxArrayString; + temp2 = True; int i, len=PySequence_Length(obj1); for (i=0; iIsSelected(arg2); @@ -4838,7 +5331,7 @@ static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4851,17 +5344,24 @@ 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; - if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2,arg3); @@ -4881,12 +5381,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); @@ -4906,12 +5411,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); @@ -4931,12 +5441,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); @@ -4973,8 +5490,10 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args temp2 = True; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4983,7 +5502,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -5028,12 +5547,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); @@ -5093,12 +5617,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); @@ -5171,7 +5700,117 @@ static PyObject *_wrap_ListBox_IsSorted(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_ListBox_SetItemForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxListBox *arg1 = (wxListBox *) 0 ; + int arg2 ; + wxColour *arg3 = 0 ; + wxColour temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item",(char *) "c", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemForegroundColour",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; + } + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxListBox_SetItemForegroundColour(arg1,arg2,(wxColour const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_ListBox_SetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxListBox *arg1 = (wxListBox *) 0 ; + int arg2 ; + wxColour *arg3 = 0 ; + wxColour temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item",(char *) "c", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemBackgroundColour",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; + } + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxListBox_SetItemBackgroundColour(arg1,arg2,(wxColour const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_ListBox_SetItemFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxListBox *arg1 = (wxListBox *) 0 ; + int arg2 ; + wxFont *arg3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item",(char *) "f", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemFont",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 ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg3 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxListBox_SetItemFont(arg1,arg2,(wxFont const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; @@ -5193,29 +5832,36 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - int arg5 = (int) 0 ; - wxString *arg6 = (wxString *) NULL ; - long arg7 = (long) 0 ; - wxValidator const &arg8_defvalue = wxDefaultValidator ; - wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; - wxString const &arg9_defvalue = wxPyListBoxNameStr ; - wxString *arg9 = (wxString *) &arg9_defvalue ; + wxArrayString const &arg5_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg5 = (wxArrayString *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxValidator const &arg7_defvalue = wxDefaultValidator ; + wxValidator *arg7 = (wxValidator *) &arg7_defvalue ; + wxString const &arg8_defvalue = wxPyListBoxNameStr ; + wxString *arg8 = (wxString *) &arg8_defvalue ; wxCheckListBox *result; wxPoint temp3 ; wxSize temp4 ; + bool temp5 = 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 ; 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; @@ -5230,47 +5876,68 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject } if (obj4) { { - arg5 = PyList_Size(obj4); - arg6 = wxString_LIST_helper(obj4); - if (arg6 == NULL) SWIG_fail; + if (! PySequence_Check(obj4)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg5 = new wxArrayString; + temp5 = True; + int i, len=PySequence_Length(obj4); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj5) { + { + arg6 = (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) { + if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg7 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj7) { { - arg9 = wxString_in_helper(obj7); - if (arg9 == NULL) SWIG_fail; + arg8 = wxString_in_helper(obj7); + if (arg8 == NULL) SWIG_fail; temp8 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCheckListBox *)new wxCheckListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); + result = (wxCheckListBox *)new wxCheckListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,(wxArrayString const &)*arg5,arg6,(wxValidator const &)*arg7,(wxString const &)*arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCheckListBox, 1); { - if (arg6) delete [] arg6; + if (temp5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return resultobj; fail: { - if (arg6) delete [] arg6; + if (temp5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return NULL; } @@ -5307,31 +5974,38 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - long arg8 = (long) 0 ; - wxValidator const &arg9_defvalue = wxDefaultValidator ; - wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; - wxString const &arg10_defvalue = wxPyListBoxNameStr ; - wxString *arg10 = (wxString *) &arg10_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + long arg7 = (long) 0 ; + wxValidator const &arg8_defvalue = wxDefaultValidator ; + wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; + wxString const &arg9_defvalue = wxPyListBoxNameStr ; + wxString *arg9 = (wxString *) &arg9_defvalue ; bool result; wxPoint temp4 ; wxSize temp5 ; + bool temp6 = 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 *) "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; @@ -5346,47 +6020,68 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + temp6 = True; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj6) { + { + arg7 = (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) { + if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg8 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj8) { { - arg10 = wxString_in_helper(obj8); - if (arg10 == NULL) SWIG_fail; + arg9 = wxString_in_helper(obj8); + if (arg9 == NULL) SWIG_fail; temp9 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return resultobj; fail: { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return NULL; } @@ -5398,12 +6093,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); @@ -5411,7 +6111,7 @@ static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5424,12 +6124,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); @@ -5462,7 +6174,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; @@ -5494,7 +6206,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; @@ -5508,12 +6220,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); @@ -5521,7 +6243,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; @@ -5535,7 +6257,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; } @@ -5588,8 +6310,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; @@ -5606,6 +6329,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); @@ -5662,7 +6391,13 @@ static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args) { return _wrap_new_TextAttr__SWIG_1(self,args); } { - _v = (PyInt_Check(argv[3]) || PyLong_Check(argv[3])) ? 1 : 0; + 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); @@ -5677,6 +6412,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 ; @@ -5770,16 +6529,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); @@ -5799,12 +6565,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); @@ -5823,6 +6594,7 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxTextAttr *arg1 = (wxTextAttr *) 0 ; wxArrayInt *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5837,6 +6609,7 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject SWIG_fail; } arg2 = new wxArrayInt; + temp2 = True; int i, len=PySequence_Length(obj1); for (i=0; iSetLeftIndent(arg2); @@ -5896,12 +6674,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); @@ -5921,12 +6704,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); @@ -5959,7 +6747,7 @@ static PyObject *_wrap_TextAttr_HasTextColour(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5984,7 +6772,7 @@ static PyObject *_wrap_TextAttr_HasBackgroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6009,7 +6797,7 @@ static PyObject *_wrap_TextAttr_HasFont(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6034,7 +6822,7 @@ static PyObject *_wrap_TextAttr_HasAlignment(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6059,7 +6847,7 @@ static PyObject *_wrap_TextAttr_HasTabs(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6084,7 +6872,7 @@ static PyObject *_wrap_TextAttr_HasLeftIndent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6109,7 +6897,7 @@ static PyObject *_wrap_TextAttr_HasRightIndent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6122,12 +6910,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); @@ -6135,7 +6928,7 @@ static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6244,7 +7037,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; @@ -6305,7 +7098,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; @@ -6330,7 +7123,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; @@ -6355,7 +7148,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; @@ -6380,7 +7173,7 @@ static PyObject *_wrap_TextAttr_IsDefault(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6456,17 +7249,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); @@ -6486,6 +7285,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) { @@ -6578,18 +7383,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); @@ -6609,6 +7420,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) { @@ -6629,7 +7446,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -6730,12 +7547,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); @@ -6762,12 +7589,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); @@ -6775,7 +7607,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; @@ -6788,12 +7620,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); @@ -6832,7 +7669,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; @@ -6857,7 +7694,7 @@ static PyObject *_wrap_TextCtrl_IsModified(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6882,7 +7719,7 @@ static PyObject *_wrap_TextCtrl_IsEditable(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6907,7 +7744,7 @@ static PyObject *_wrap_TextCtrl_IsSingleLine(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6932,7 +7769,7 @@ static PyObject *_wrap_TextCtrl_IsMultiLine(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7040,13 +7877,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; @@ -7080,12 +7927,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); @@ -7126,7 +7983,7 @@ static PyObject *_wrap_TextCtrl_LoadFile(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -7170,7 +8027,7 @@ static PyObject *_wrap_TextCtrl_SaveFile(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -7245,8 +8102,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaxLength(arg2); @@ -7365,7 +8224,7 @@ static PyObject *_wrap_TextCtrl_EmulateKeyPress(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7380,13 +8239,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; @@ -7398,7 +8267,7 @@ static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7412,13 +8281,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; @@ -7430,7 +8304,7 @@ static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7461,7 +8335,7 @@ static PyObject *_wrap_TextCtrl_SetDefaultStyle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7503,12 +8377,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); @@ -7516,7 +8400,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; @@ -7532,14 +8416,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); @@ -7567,12 +8456,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); @@ -7587,6 +8481,52 @@ static PyObject *_wrap_TextCtrl_ShowPosition(PyObject *self, PyObject *args, PyO } +static PyObject *_wrap_TextCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; + wxPoint *arg2 = 0 ; + long *arg3 = (long *) 0 ; + long *arg4 = (long *) 0 ; + int result; + wxPoint temp2 ; + long temp3 ; + long temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pt", NULL + }; + + arg3 = &temp3; + arg4 = &temp4; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_HitTest",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxTextCtrl const *)arg1)->HitTest((wxPoint const &)*arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + { + PyObject *o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj,o); + } + { + PyObject *o = PyInt_FromLong((long) (*arg4)); + resultobj = t_output_helper(resultobj,o); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TextCtrl_Copy(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; @@ -7677,7 +8617,7 @@ static PyObject *_wrap_TextCtrl_CanCopy(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7702,7 +8642,7 @@ static PyObject *_wrap_TextCtrl_CanCut(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7727,7 +8667,7 @@ static PyObject *_wrap_TextCtrl_CanPaste(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7800,7 +8740,7 @@ static PyObject *_wrap_TextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7825,7 +8765,7 @@ static PyObject *_wrap_TextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7837,12 +8777,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); @@ -7899,7 +8844,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; @@ -7924,7 +8869,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; @@ -7937,12 +8882,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); @@ -7993,8 +8948,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEditable(arg2); @@ -8023,8 +8980,10 @@ static PyObject *_wrap_TextCtrl_ShowNativeCaret(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TextCtrl_ShowNativeCaret",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8033,7 +8992,7 @@ static PyObject *_wrap_TextCtrl_ShowNativeCaret(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8058,7 +9017,7 @@ static PyObject *_wrap_TextCtrl_HideNativeCaret(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8112,12 +9071,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); @@ -8152,16 +9121,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); @@ -8222,7 +9206,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; @@ -8247,7 +9231,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; @@ -8261,7 +9245,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; } @@ -8299,16 +9283,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; @@ -8321,6 +9313,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) { @@ -8398,17 +9396,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; @@ -8421,6 +9427,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) { @@ -8441,7 +9453,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -8474,7 +9486,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; @@ -8499,7 +9511,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; @@ -8524,7 +9536,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; @@ -8549,7 +9561,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; @@ -8574,7 +9586,7 @@ static PyObject *_wrap_ScrollBar_IsVertical(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8586,12 +9598,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); @@ -8615,17 +9632,39 @@ 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; - if (obj5) { - arg6 = PyInt_AsLong(obj5) ? true : false; + { + 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; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScrollbar(arg2,arg3,arg4,arg5,arg6); @@ -8647,7 +9686,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; } @@ -8667,7 +9706,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; } @@ -8703,15 +9742,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; @@ -8724,6 +9771,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); @@ -8793,16 +9846,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; @@ -8815,6 +9876,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); @@ -8829,7 +9896,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -8862,7 +9929,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; @@ -8887,7 +9954,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; @@ -8912,7 +9979,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; @@ -8924,12 +9991,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); @@ -8949,12 +10021,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); @@ -8974,12 +10051,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); @@ -9000,12 +10082,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); @@ -9038,7 +10130,7 @@ static PyObject *_wrap_SpinButton_IsVertical(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9074,16 +10166,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); @@ -9103,6 +10206,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); @@ -9186,17 +10313,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); @@ -9216,6 +10354,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); @@ -9230,7 +10392,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -9271,7 +10433,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; @@ -9283,12 +10445,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); @@ -9349,12 +10516,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); @@ -9387,7 +10564,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; @@ -9412,7 +10589,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; @@ -9425,12 +10602,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); @@ -9457,11 +10644,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); @@ -9494,7 +10695,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; @@ -9506,12 +10707,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); @@ -9533,7 +10739,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; } @@ -9553,7 +10759,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; } @@ -9582,32 +10788,40 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - int arg8 = (int) 0 ; - long arg9 = (long) wxRA_HORIZONTAL ; - wxValidator const &arg10_defvalue = wxDefaultValidator ; - wxValidator *arg10 = (wxValidator *) &arg10_defvalue ; - wxString const &arg11_defvalue = wxPyRadioBoxNameStr ; - wxString *arg11 = (wxString *) &arg11_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + int arg7 = (int) 0 ; + long arg8 = (long) wxRA_HORIZONTAL ; + wxValidator const &arg9_defvalue = wxDefaultValidator ; + wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; + wxString const &arg10_defvalue = wxPyRadioBoxNameStr ; + wxString *arg10 = (wxString *) &arg10_defvalue ; wxRadioBox *result; bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; + bool temp6 = False ; 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; @@ -9627,27 +10841,54 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + temp6 = True; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg8 = (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) { + if ((SWIG_ConvertPtr(obj8,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg9 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj9) { { - arg11 = wxString_in_helper(obj9); - if (arg11 == NULL) SWIG_fail; + arg10 = wxString_in_helper(obj9); + if (arg10 == NULL) SWIG_fail; temp10 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxRadioBox *)new wxRadioBox(arg1,arg2,(wxString const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,arg9,(wxValidator const &)*arg10,(wxString const &)*arg11); + result = (wxRadioBox *)new wxRadioBox(arg1,arg2,(wxString const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9658,11 +10899,11 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw delete arg3; } { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp10) - delete arg11; + delete arg10; } return resultobj; fail: @@ -9671,11 +10912,11 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw delete arg3; } { - if (arg7) delete [] arg7; + if (temp6) delete arg6; } { if (temp10) - delete arg11; + delete arg10; } return NULL; } @@ -9713,34 +10954,42 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; wxSize const &arg6_defvalue = wxDefaultSize ; wxSize *arg6 = (wxSize *) &arg6_defvalue ; - int arg7 = (int) 0 ; - wxString *arg8 = (wxString *) NULL ; - int arg9 = (int) 0 ; - long arg10 = (long) wxRA_HORIZONTAL ; - wxValidator const &arg11_defvalue = wxDefaultValidator ; - wxValidator *arg11 = (wxValidator *) &arg11_defvalue ; - wxString const &arg12_defvalue = wxPyRadioBoxNameStr ; - wxString *arg12 = (wxString *) &arg12_defvalue ; + wxArrayString const &arg7_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg7 = (wxArrayString *) &arg7_defvalue ; + int arg8 = (int) 0 ; + long arg9 = (long) wxRA_HORIZONTAL ; + wxValidator const &arg10_defvalue = wxDefaultValidator ; + wxValidator *arg10 = (wxValidator *) &arg10_defvalue ; + wxString const &arg11_defvalue = wxPyRadioBoxNameStr ; + wxString *arg11 = (wxString *) &arg11_defvalue ; bool result; bool temp4 = False ; wxPoint temp5 ; wxSize temp6 ; + bool temp7 = False ; 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; @@ -9760,42 +11009,69 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject } if (obj6) { { - arg7 = PyList_Size(obj6); - arg8 = wxString_LIST_helper(obj6); - if (arg8 == NULL) SWIG_fail; + if (! PySequence_Check(obj6)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg7 = new wxArrayString; + temp7 = True; + int i, len=PySequence_Length(obj6); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } + } + } + if (obj7) { + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj8) { + { + arg9 = (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) { + if ((SWIG_ConvertPtr(obj9,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg10 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj10) { { - arg12 = wxString_in_helper(obj10); - if (arg12 == NULL) SWIG_fail; + arg11 = wxString_in_helper(obj10); + if (arg11 == NULL) SWIG_fail; temp11 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,arg7,arg8,arg9,arg10,(wxValidator const &)*arg11,(wxString const &)*arg12); + result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,(wxArrayString const &)*arg7,arg8,arg9,(wxValidator const &)*arg10,(wxString const &)*arg11); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; } { - if (arg8) delete [] arg8; + if (temp7) delete arg7; } { if (temp11) - delete arg12; + delete arg11; } return resultobj; fail: @@ -9804,11 +11080,11 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject delete arg4; } { - if (arg8) delete [] arg8; + if (temp7) delete arg7; } { if (temp11) - delete arg12; + delete arg11; } return NULL; } @@ -9819,12 +11095,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); @@ -9857,7 +11138,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; @@ -9921,7 +11202,7 @@ static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9954,7 +11235,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; @@ -9987,7 +11268,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; @@ -10008,12 +11289,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); @@ -10041,13 +11327,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; @@ -10081,17 +11372,24 @@ 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; - if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Enable(arg2,arg3); @@ -10112,17 +11410,24 @@ 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; - if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Show(arg2,arg3); @@ -10155,7 +11460,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; @@ -10180,7 +11485,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; @@ -10195,12 +11500,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); @@ -10208,7 +11528,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; @@ -10242,17 +11562,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; @@ -10270,6 +11596,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) { @@ -10357,18 +11689,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; @@ -10386,6 +11724,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) { @@ -10406,7 +11750,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -10447,7 +11791,7 @@ static PyObject *_wrap_RadioButton_GetValue(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10466,8 +11810,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -10489,7 +11835,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; } @@ -10530,16 +11876,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; @@ -10552,6 +11919,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) { @@ -10632,17 +12005,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; @@ -10655,6 +12049,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) { @@ -10675,7 +12075,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 = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp11) delete arg11; @@ -10708,7 +12108,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; @@ -10720,12 +12120,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); @@ -10746,12 +12151,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); @@ -10784,7 +12199,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; @@ -10809,7 +12224,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; @@ -10821,12 +12236,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); @@ -10846,12 +12266,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); @@ -10871,12 +12296,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); @@ -10896,12 +12326,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); @@ -10934,7 +12369,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; @@ -10959,7 +12394,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; @@ -10971,12 +12406,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); @@ -11009,7 +12449,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; @@ -11020,14 +12460,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); @@ -11060,7 +12512,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; @@ -11096,12 +12548,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); @@ -11158,7 +12615,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; @@ -11183,7 +12640,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; @@ -11196,12 +12653,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); @@ -11223,7 +12690,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; } @@ -11263,17 +12730,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; @@ -11291,6 +12764,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) { @@ -11378,18 +12857,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; @@ -11407,6 +12892,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) { @@ -11427,7 +12918,7 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -11462,8 +12953,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetValue(arg2); @@ -11496,7 +12989,7 @@ static PyObject *_wrap_ToggleButton_GetValue(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11550,7 +13043,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; } @@ -11588,7 +13081,7 @@ static PyObject *_wrap_BookCtrl_GetPageCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -11608,8 +13101,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxWindow *)(arg1)->GetPage(arg2); @@ -11644,7 +13139,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; @@ -11667,8 +13162,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -11681,7 +13178,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -11709,8 +13206,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxBookCtrl const *)arg1)->GetPageText(arg2); @@ -11770,7 +13269,7 @@ static PyObject *_wrap_BookCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_AssignImageList",kwnames,&obj0,&obj1)) 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_wxImageList,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; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -11825,8 +13324,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxBookCtrl const *)arg1)->GetPageImage(arg2); @@ -11834,7 +13335,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; @@ -11849,14 +13350,21 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetPageImage(arg2,arg3); @@ -11864,7 +13372,7 @@ static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11951,8 +13459,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeletePage(arg2); @@ -11960,7 +13470,7 @@ static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11980,8 +13490,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->RemovePage(arg2); @@ -11989,7 +13501,7 @@ static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12014,7 +13526,7 @@ static PyObject *_wrap_BookCtrl_DeleteAllPages(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12034,11 +13546,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; { @@ -12047,8 +13560,16 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject temp3 = True; } if (obj3) { - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12057,7 +13578,7 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -12087,14 +13608,17 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + 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; { arg4 = wxString_in_helper(obj3); @@ -12102,8 +13626,16 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj temp4 = True; } if (obj4) { - arg5 = PyInt_AsLong(obj4) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg5 = (bool) SWIG_PyObj_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12112,7 +13644,7 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -12140,8 +13672,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->SetSelection(arg2); @@ -12149,7 +13683,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; @@ -12169,8 +13703,10 @@ static PyObject *_wrap_BookCtrl_AdvanceSelection(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:BookCtrl_AdvanceSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBookCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12200,11 +13736,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); @@ -12237,7 +13801,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; @@ -12249,12 +13813,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); @@ -12287,7 +13856,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; @@ -12299,12 +13868,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); @@ -12342,15 +13916,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; @@ -12363,6 +13943,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); @@ -12436,16 +14022,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; @@ -12458,6 +14050,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); @@ -12472,7 +14070,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -12505,7 +14103,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; @@ -12602,7 +14200,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); @@ -12697,11 +14295,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); @@ -12739,15 +14365,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; @@ -12760,6 +14392,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); @@ -12829,16 +14467,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; @@ -12851,6 +14495,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); @@ -12865,7 +14515,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -12898,7 +14548,7 @@ static PyObject *_wrap_Listbook_IsVertical(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12919,11 +14569,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); @@ -13185,7 +14863,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; @@ -13264,7 +14942,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; @@ -13289,7 +14967,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; @@ -13314,7 +14992,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; @@ -13339,7 +15017,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; @@ -13364,7 +15042,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; @@ -13389,7 +15067,7 @@ static PyObject *_wrap_ToolBarToolBase_IsEnabled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13414,7 +15092,7 @@ static PyObject *_wrap_ToolBarToolBase_IsToggled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13439,7 +15117,7 @@ static PyObject *_wrap_ToolBarToolBase_CanBeToggled(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13637,8 +15315,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Enable(arg2); @@ -13646,7 +15326,7 @@ static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13690,8 +15370,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetToggle(arg2); @@ -13699,7 +15381,7 @@ static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13732,7 +15414,7 @@ static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -13773,7 +15455,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14017,9 +15699,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 ; @@ -14027,8 +15711,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; @@ -14044,6 +15732,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); @@ -14122,9 +15816,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 ; @@ -14132,10 +15828,16 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(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; @@ -14151,6 +15853,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); @@ -14253,8 +15961,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + 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; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14317,8 +16027,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + 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; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14342,12 +16054,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); @@ -14404,8 +16121,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxToolBarToolBase *)(arg1)->InsertSeparator(arg2); @@ -14428,12 +16147,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); @@ -14463,8 +16187,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->DeleteToolByPos(arg2); @@ -14472,7 +16198,7 @@ static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14485,12 +16211,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); @@ -14498,7 +16229,7 @@ static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14547,7 +16278,7 @@ static PyObject *_wrap_ToolBarBase_Realize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14560,15 +16291,22 @@ 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 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnableTool(arg2,arg3); @@ -14589,15 +16327,22 @@ 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 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ToggleTool(arg2,arg3); @@ -14618,15 +16363,22 @@ 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 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToggle(arg2,arg3); @@ -14647,12 +16399,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); @@ -14673,13 +16430,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(); @@ -14701,12 +16463,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); @@ -14714,7 +16481,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; @@ -14727,12 +16494,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); @@ -14740,7 +16512,7 @@ static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14753,12 +16525,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); @@ -14766,7 +16543,7 @@ static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14780,13 +16557,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; @@ -14820,12 +16602,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); @@ -14853,13 +16640,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; @@ -14893,12 +16685,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); @@ -14925,12 +16722,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); @@ -14981,12 +16788,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); @@ -15006,12 +16818,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); @@ -15102,7 +16919,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; @@ -15127,7 +16944,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; @@ -15139,12 +16956,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); @@ -15165,12 +16987,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); @@ -15203,7 +17035,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; @@ -15228,7 +17060,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; @@ -15331,12 +17163,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); @@ -15359,12 +17201,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); @@ -15399,7 +17246,7 @@ static PyObject *_wrap_ToolBarBase_IsVertical(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15429,15 +17276,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; @@ -15450,6 +17303,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); @@ -15523,16 +17382,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; @@ -15545,6 +17410,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); @@ -15559,7 +17430,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -15581,12 +17452,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); @@ -15610,7 +17491,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; } @@ -15791,7 +17672,7 @@ static PyObject *_wrap_ListItemAttr_HasTextColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15816,7 +17697,7 @@ static PyObject *_wrap_ListItemAttr_HasBackgroundColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15841,7 +17722,7 @@ static PyObject *_wrap_ListItemAttr_HasFont(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16067,12 +17948,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); @@ -16092,12 +17978,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); @@ -16117,12 +18008,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); @@ -16142,12 +18038,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); @@ -16167,12 +18068,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); @@ -16232,12 +18138,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); @@ -16257,12 +18168,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); @@ -16282,12 +18198,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); @@ -16307,12 +18228,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); @@ -16437,7 +18363,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; @@ -16462,7 +18388,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; @@ -16487,7 +18413,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; @@ -16512,7 +18438,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; @@ -16571,7 +18497,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; @@ -16596,7 +18522,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; @@ -16621,7 +18547,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; @@ -16646,7 +18572,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; @@ -16696,7 +18622,7 @@ static PyObject *_wrap_ListItem_HasAttributes(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16795,12 +18721,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; @@ -16823,7 +18754,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; @@ -16835,12 +18766,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; @@ -16863,7 +18799,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; @@ -16875,12 +18811,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; @@ -16903,7 +18844,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; @@ -16915,12 +18856,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; @@ -16943,7 +18889,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; @@ -16955,12 +18901,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; @@ -16983,7 +18934,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; @@ -17056,12 +19007,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; @@ -17084,7 +19040,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; @@ -17096,12 +19052,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; @@ -17124,7 +19085,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; @@ -17136,12 +19097,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; @@ -17164,7 +19130,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; @@ -17176,12 +19142,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; @@ -17204,7 +19175,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; @@ -17223,11 +19194,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); @@ -17247,12 +19232,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; @@ -17275,7 +19265,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; @@ -17287,12 +19277,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; @@ -17315,7 +19310,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; @@ -17327,12 +19322,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; @@ -17355,7 +19355,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; @@ -17367,12 +19367,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; @@ -17395,7 +19400,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; @@ -17484,7 +19489,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; @@ -17509,7 +19514,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; @@ -17534,7 +19539,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; @@ -17656,7 +19661,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; @@ -17681,7 +19686,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; @@ -17706,7 +19711,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; @@ -17759,7 +19764,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; @@ -17784,7 +19789,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; @@ -17809,7 +19814,7 @@ static PyObject *_wrap_ListEvent_IsEditCancelled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17828,8 +19833,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEditCanceled(arg2); @@ -17869,16 +19876,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; @@ -17891,6 +19906,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) { @@ -17968,17 +19989,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; @@ -17991,6 +20020,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) { @@ -18011,7 +20046,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -18081,7 +20116,7 @@ static PyObject *_wrap_ListCtrl_SetForegroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18113,7 +20148,7 @@ static PyObject *_wrap_ListCtrl_SetBackgroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18126,12 +20161,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); @@ -18155,13 +20195,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; @@ -18173,7 +20218,7 @@ static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18186,12 +20231,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); @@ -18199,7 +20249,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; @@ -18213,12 +20263,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); @@ -18226,7 +20286,7 @@ static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18251,7 +20311,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; @@ -18321,12 +20381,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); @@ -18367,7 +20439,7 @@ static PyObject *_wrap_ListCtrl_SetItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18384,18 +20456,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); @@ -18403,7 +20492,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; @@ -18425,12 +20514,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); @@ -18438,7 +20537,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; @@ -18453,12 +20552,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); @@ -18466,7 +20580,7 @@ static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18481,12 +20595,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); @@ -18494,7 +20623,7 @@ static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18507,12 +20636,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); @@ -18540,13 +20674,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; @@ -18580,12 +20719,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); @@ -18593,7 +20737,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; @@ -18607,12 +20751,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); @@ -18620,7 +20774,7 @@ static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18633,12 +20787,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); @@ -18664,12 +20823,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); @@ -18696,13 +20867,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; @@ -18714,7 +20890,7 @@ static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18739,7 +20915,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; @@ -18764,7 +20940,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; @@ -18818,7 +20994,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; @@ -18903,7 +21079,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; @@ -18916,17 +21092,24 @@ 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; - if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSingleStyle(arg2,arg3); @@ -18946,12 +21129,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); @@ -18974,12 +21162,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); @@ -18987,7 +21194,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; @@ -19000,12 +21207,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); @@ -19029,13 +21241,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); @@ -19057,13 +21274,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 | 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); @@ -19096,7 +21318,7 @@ static PyObject *_wrap_ListCtrl_IsVirtual(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19108,12 +21330,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); @@ -19134,12 +21361,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); @@ -19160,12 +21397,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); @@ -19173,7 +21417,7 @@ static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19186,12 +21430,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); @@ -19199,7 +21448,7 @@ static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19224,7 +21473,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllItems(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19237,12 +21486,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); @@ -19250,7 +21504,7 @@ static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19275,7 +21529,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllColumns(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19312,12 +21566,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); @@ -19347,8 +21606,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->EndEditLabel(arg2); @@ -19356,7 +21617,7 @@ static PyObject *_wrap_ListCtrl_EndEditLabel(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19369,12 +21630,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); @@ -19382,7 +21648,7 @@ static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19398,22 +21664,29 @@ 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; temp3 = True; } if (obj3) { - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19422,7 +21695,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; @@ -19444,12 +21717,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); @@ -19457,7 +21740,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; @@ -19473,17 +21756,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); @@ -19491,7 +21784,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; @@ -19526,7 +21819,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); @@ -19561,7 +21854,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; @@ -19576,13 +21869,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; @@ -19595,7 +21893,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; @@ -19617,12 +21915,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); @@ -19630,7 +21938,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; @@ -19646,18 +21954,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); @@ -19665,7 +21983,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; @@ -19687,13 +22005,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; @@ -19705,7 +22028,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; @@ -19722,18 +22045,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); @@ -19741,7 +22083,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; @@ -19761,12 +22103,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); @@ -19788,12 +22135,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); @@ -19801,7 +22158,7 @@ static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19815,13 +22172,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; @@ -19846,12 +22208,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); @@ -19877,13 +22244,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; @@ -19908,12 +22280,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); @@ -19953,7 +22330,7 @@ static PyObject *_wrap_ListCtrl_SortItems(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20012,16 +22389,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; @@ -20034,6 +22419,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) { @@ -20111,17 +22502,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; @@ -20134,6 +22533,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) { @@ -20154,7 +22559,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -20175,17 +22580,24 @@ 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; - if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Select(arg2,arg3); @@ -20205,12 +22617,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); @@ -20243,7 +22660,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; @@ -20256,12 +22673,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); @@ -20269,7 +22691,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; @@ -20294,7 +22716,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; @@ -20307,12 +22729,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); @@ -20320,7 +22747,7 @@ static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20333,12 +22760,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); @@ -20358,12 +22795,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); @@ -20385,7 +22827,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; } @@ -20469,7 +22911,7 @@ static PyObject *_wrap_TreeItemId_IsOk(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20497,7 +22939,7 @@ static PyObject *_wrap_TreeItemId___eq__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20525,7 +22967,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20535,7 +22977,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTreeItemId *arg1 = (wxTreeItemId *) 0 ; - wxTreeItemIdValue arg2 = (wxTreeItemIdValue) 0 ; + void *arg2 = (void *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -20557,7 +22999,7 @@ static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, Py static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTreeItemId *arg1 = (wxTreeItemId *) 0 ; - wxTreeItemIdValue result; + void *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -20565,9 +23007,9 @@ static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TreeItemId_m_pItem_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxTreeItemIdValue) ((arg1)->m_pItem); + result = (void *) ((arg1)->m_pItem); - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_wxTreeItemIdValue, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_void, 0); return resultobj; fail: return NULL; @@ -20754,11 +23196,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); @@ -20997,7 +23453,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; @@ -21126,7 +23582,7 @@ static PyObject *_wrap_TreeEvent_IsEditCancelled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21145,8 +23601,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEditCanceled(arg2); @@ -21226,16 +23684,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; @@ -21248,6 +23714,12 @@ static PyObject *_wrap_new_TreeCtrl(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) { @@ -21329,17 +23801,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; @@ -21352,6 +23832,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) { @@ -21372,7 +23858,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -21435,7 +23921,7 @@ static PyObject *_wrap_TreeCtrl_GetCount(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -21460,7 +23946,7 @@ static PyObject *_wrap_TreeCtrl_GetIndent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -21479,8 +23965,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetIndent(arg2); @@ -21513,7 +24001,7 @@ static PyObject *_wrap_TreeCtrl_GetSpacing(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedInt((unsigned int)result); return resultobj; fail: return NULL; @@ -21532,8 +24020,10 @@ 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) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSpacing(arg2); @@ -21668,7 +24158,7 @@ static PyObject *_wrap_TreeCtrl_AssignImageList(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_AssignImageList",kwnames,&obj0,&obj1)) 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_wxImageList,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; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignImageList(arg2); @@ -21695,7 +24185,7 @@ static PyObject *_wrap_TreeCtrl_AssignStateImageList(PyObject *self, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_AssignStateImageList",kwnames,&obj0,&obj1)) 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_wxImageList,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; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->AssignStateImageList(arg2); @@ -21755,16 +24245,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); @@ -21772,7 +24269,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; @@ -22000,16 +24497,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); @@ -22109,8 +24618,10 @@ static PyObject *_wrap_TreeCtrl_SetItemHasChildren(PyObject *self, PyObject *arg PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22145,8 +24656,10 @@ static PyObject *_wrap_TreeCtrl_SetItemBold(PyObject *self, PyObject *args, PyOb PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22181,8 +24694,10 @@ static PyObject *_wrap_TreeCtrl_SetItemDropHighlight(PyObject *self, PyObject *a PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22332,7 +24847,7 @@ static PyObject *_wrap_TreeCtrl_IsVisible(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22363,7 +24878,7 @@ static PyObject *_wrap_TreeCtrl_ItemHasChildren(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22394,7 +24909,7 @@ static PyObject *_wrap_TreeCtrl_IsExpanded(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22425,7 +24940,7 @@ static PyObject *_wrap_TreeCtrl_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22456,7 +24971,7 @@ static PyObject *_wrap_TreeCtrl_IsBold(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22483,8 +24998,10 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22493,7 +25010,7 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22653,7 +25170,7 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxTreeItemIdValue *arg3 = 0 ; + void *arg3 = (void *) 0 ; PyObject *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -22668,13 +25185,10 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxTreeItemIdValue,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg3 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxPyTreeCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,*arg3); + result = (PyObject *)wxPyTreeCtrl_GetNextChild(arg1,(wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -22901,18 +25415,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; } @@ -22955,12 +25483,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) { @@ -22971,6 +25501,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; } @@ -23015,12 +25557,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) { @@ -23035,6 +25579,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; } @@ -23079,24 +25635,40 @@ 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) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(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; + } + } + 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; } @@ -23139,12 +25711,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) { @@ -23155,6 +25729,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; } @@ -23412,6 +25998,36 @@ static PyObject *_wrap_TreeCtrl_Unselect(PyObject *self, PyObject *args, PyObjec } +static PyObject *_wrap_TreeCtrl_UnselectItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_UnselectItem",kwnames,&obj0,&obj1)) 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; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->UnselectItem((wxTreeItemId const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; @@ -23437,6 +26053,44 @@ static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + bool arg3 = (bool) True ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item",(char *) "select", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeCtrl_SelectItem",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 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectItem((wxTreeItemId const &)*arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_TreeCtrl_ToggleItemSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -23446,7 +26100,7 @@ static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObj (char *) "self",(char *) "item", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SelectItem",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_ToggleItemSelection",kwnames,&obj0,&obj1)) 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) { @@ -23454,7 +26108,7 @@ static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectItem((wxTreeItemId const &)*arg2); + (arg1)->ToggleItemSelection((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23602,8 +26256,10 @@ static PyObject *_wrap_TreeCtrl_EndEditLabel(PyObject *self, PyObject *args, PyO PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23712,8 +26368,10 @@ static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args, PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23736,7 +26394,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; } @@ -23779,17 +26437,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); @@ -23809,6 +26476,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); @@ -23816,6 +26489,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); @@ -23908,18 +26587,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); @@ -23939,6 +26627,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); @@ -23946,6 +26640,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); @@ -23960,7 +26660,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -24017,7 +26717,7 @@ static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -24217,8 +26917,10 @@ 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 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->ShowHidden(arg2); @@ -24251,7 +26953,7 @@ static PyObject *_wrap_GenericDirCtrl_GetShowHidden(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24347,7 +27049,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; @@ -24359,12 +27061,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); @@ -24585,14 +27292,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; @@ -24605,6 +27320,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); @@ -24656,15 +27377,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; @@ -24677,6 +27406,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); @@ -24684,7 +27419,7 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24699,17 +27434,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); @@ -24757,16 +27497,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; @@ -24779,6 +27525,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) { @@ -24852,12 +27604,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); @@ -24881,12 +27653,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); @@ -24907,12 +27706,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); @@ -24933,12 +27742,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); @@ -25167,7 +27986,7 @@ static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25192,7 +28011,7 @@ static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25217,7 +28036,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 = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25242,7 +28061,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25267,7 +28086,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25372,12 +28191,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; @@ -25628,8 +28461,10 @@ static PyObject *_wrap_new_ContextHelp(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25692,7 +28527,7 @@ static PyObject *_wrap_ContextHelp_BeginContextHelp(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25717,7 +28552,7 @@ static PyObject *_wrap_ContextHelp_EndContextHelp(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25744,14 +28579,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; @@ -25764,6 +28607,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); @@ -25887,7 +28736,7 @@ static PyObject *_wrap_HelpProvider_ShowHelp(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25944,13 +28793,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; @@ -26199,15 +29053,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); @@ -26299,8 +29158,10 @@ 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 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } } if (obj4) { if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -26312,7 +29173,7 @@ static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26350,7 +29211,7 @@ static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26375,7 +29236,7 @@ static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26407,7 +29268,7 @@ static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26432,7 +29293,7 @@ static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26457,7 +29318,7 @@ static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26531,7 +29392,7 @@ static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26582,7 +29443,7 @@ static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26618,10 +29479,14 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - arg5 = PyInt_AsLong(obj4) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (bool) SWIG_PyObj_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->RedrawImage((wxPoint const &)*arg2,(wxPoint const &)*arg3,arg4,arg5); @@ -26629,7 +29494,7 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26648,8 +29513,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PreButton", (PyCFunction) _wrap_new_PreButton, METH_VARARGS | METH_KEYWORDS }, { (char *)"Button_Create", (PyCFunction) _wrap_Button_Create, METH_VARARGS | METH_KEYWORDS }, { (char *)"Button_SetDefault", (PyCFunction) _wrap_Button_SetDefault, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Button_SetImageLabel", (PyCFunction) _wrap_Button_SetImageLabel, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Button_SetImageMargins", (PyCFunction) _wrap_Button_SetImageMargins, METH_VARARGS | METH_KEYWORDS }, { (char *)"Button_GetDefaultSize", (PyCFunction) _wrap_Button_GetDefaultSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Button_swigregister", Button_swigregister, METH_VARARGS }, { (char *)"new_BitmapButton", (PyCFunction) _wrap_new_BitmapButton, METH_VARARGS | METH_KEYWORDS }, @@ -26681,8 +29544,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Choice", (PyCFunction) _wrap_new_Choice, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreChoice", (PyCFunction) _wrap_new_PreChoice, METH_VARARGS | METH_KEYWORDS }, { (char *)"Choice_Create", (PyCFunction) _wrap_Choice_Create, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Choice_GetColumns", (PyCFunction) _wrap_Choice_GetColumns, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Choice_SetColumns", (PyCFunction) _wrap_Choice_SetColumns, METH_VARARGS | METH_KEYWORDS }, { (char *)"Choice_SetSelection", (PyCFunction) _wrap_Choice_SetSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"Choice_SetStringSelection", (PyCFunction) _wrap_Choice_SetStringSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"Choice_SetString", (PyCFunction) _wrap_Choice_SetString, METH_VARARGS | METH_KEYWORDS }, @@ -26757,6 +29618,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListBox_EnsureVisible", (PyCFunction) _wrap_ListBox_EnsureVisible, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_AppendAndEnsureVisible", (PyCFunction) _wrap_ListBox_AppendAndEnsureVisible, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_IsSorted", (PyCFunction) _wrap_ListBox_IsSorted, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListBox_SetItemForegroundColour", (PyCFunction) _wrap_ListBox_SetItemForegroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListBox_SetItemBackgroundColour", (PyCFunction) _wrap_ListBox_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListBox_SetItemFont", (PyCFunction) _wrap_ListBox_SetItemFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_swigregister", ListBox_swigregister, METH_VARARGS }, { (char *)"new_CheckListBox", (PyCFunction) _wrap_new_CheckListBox, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreCheckListBox", (PyCFunction) _wrap_new_PreCheckListBox, METH_VARARGS | METH_KEYWORDS }, @@ -26768,6 +29632,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 }, @@ -26829,6 +29694,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TextCtrl_XYToPosition", (PyCFunction) _wrap_TextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_PositionToXY", (PyCFunction) _wrap_TextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_ShowPosition", (PyCFunction) _wrap_TextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TextCtrl_HitTest", (PyCFunction) _wrap_TextCtrl_HitTest, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_Copy", (PyCFunction) _wrap_TextCtrl_Copy, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_Cut", (PyCFunction) _wrap_TextCtrl_Cut, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_Paste", (PyCFunction) _wrap_TextCtrl_Paste, METH_VARARGS | METH_KEYWORDS }, @@ -27351,8 +30217,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeCtrl_CollapseAndReset", (PyCFunction) _wrap_TreeCtrl_CollapseAndReset, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_Toggle", (PyCFunction) _wrap_TreeCtrl_Toggle, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_Unselect", (PyCFunction) _wrap_TreeCtrl_Unselect, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TreeCtrl_UnselectItem", (PyCFunction) _wrap_TreeCtrl_UnselectItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_UnselectAll", (PyCFunction) _wrap_TreeCtrl_UnselectAll, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_SelectItem", (PyCFunction) _wrap_TreeCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TreeCtrl_ToggleItemSelection", (PyCFunction) _wrap_TreeCtrl_ToggleItemSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_EnsureVisible", (PyCFunction) _wrap_TreeCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_ScrollTo", (PyCFunction) _wrap_TreeCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_EditLabel", (PyCFunction) _wrap_TreeCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS }, @@ -28437,8 +31305,6 @@ static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { static swig_type_info _swigt__p_wxTextUrlEvent[] = {{"_p_wxTextUrlEvent", 0, "wxTextUrlEvent *", 0},{"_p_wxTextUrlEvent"},{0}}; static swig_type_info _swigt__p_wxBookCtrlEvent[] = {{"_p_wxBookCtrlEvent", 0, "wxBookCtrlEvent *", 0},{"_p_wxBookCtrlEvent"},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxBookCtrlEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxBookCtrlEvent},{0}}; static swig_type_info _swigt__p_wxSizer[] = {{"_p_wxSizer", 0, "wxSizer *", 0},{"_p_wxSizer"},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxSizer},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxSizer},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxSizer},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxSizer},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxSizer},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxSizer},{"_p_wxPySizer", _p_wxPySizerTo_p_wxSizer},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxSizer},{0}}; -static swig_type_info _swigt__p_wxTreeItemIdValue[] = {{"_p_wxTreeItemIdValue", 0, "wxTreeItemIdValue *", 0},{"_p_wxTreeItemIdValue"},{0}}; -static swig_type_info _swigt__wxTreeItemIdValue[] = {{"_wxTreeItemIdValue", 0, "wxTreeItemIdValue", 0},{"_wxTreeItemIdValue"},{0}}; static swig_type_info _swigt__p_wxCheckBox[] = {{"_p_wxCheckBox", 0, "wxCheckBox *", 0},{"_p_wxCheckBox"},{0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0},{"_p_wxPyTreeCtrl"},{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_wxTreeEvent", _p_wxTreeEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxEvent},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_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_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_wxSpinEvent", _p_wxSpinEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; @@ -28459,6 +31325,7 @@ static swig_type_info _swigt__p_wxRadioButton[] = {{"_p_wxRadioButton", 0, "wxRa static swig_type_info _swigt__p_wxChoice[] = {{"_p_wxChoice", 0, "wxChoice *", 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxChoice},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxChoice},{"_p_wxChoice"},{0}}; static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0},{"_p_wxMemoryDC"},{0}}; static swig_type_info _swigt__p_wxListItemAttr[] = {{"_p_wxListItemAttr", 0, "wxListItemAttr *", 0},{"_p_wxListItemAttr"},{0}}; +static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p_wxSize"},{0}}; static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}}; @@ -28487,6 +31354,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}}; @@ -28523,8 +31391,6 @@ static swig_type_info *swig_types_initial[] = { _swigt__p_wxTextUrlEvent, _swigt__p_wxBookCtrlEvent, _swigt__p_wxSizer, -_swigt__p_wxTreeItemIdValue, -_swigt__wxTreeItemIdValue, _swigt__p_wxCheckBox, _swigt__p_wxPyTreeCtrl, _swigt__p_wxEvent, @@ -28545,6 +31411,7 @@ _swigt__p_wxRadioButton, _swigt__p_wxChoice, _swigt__p_wxMemoryDC, _swigt__p_wxListItemAttr, +_swigt__p_void, _swigt__p_int, _swigt__p_wxSize, _swigt__p_wxDC, @@ -28573,6 +31440,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, @@ -28611,256 +31479,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 @@ -28889,15 +31507,72 @@ 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,"TE_HT_UNKNOWN", SWIG_PyObj_FromInt((int)wxTE_HT_UNKNOWN)); + PyDict_SetItemString(d,"TE_HT_BEFORE", SWIG_PyObj_FromInt((int)wxTE_HT_BEFORE)); + PyDict_SetItemString(d,"TE_HT_ON_TEXT", SWIG_PyObj_FromInt((int)wxTE_HT_ON_TEXT)); + PyDict_SetItemString(d,"TE_HT_BELOW", SWIG_PyObj_FromInt((int)wxTE_HT_BELOW)); + PyDict_SetItemString(d,"TE_HT_BEYOND", SWIG_PyObj_FromInt((int)wxTE_HT_BEYOND)); 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)); @@ -28905,6 +31580,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); @@ -28912,11 +31591,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)); @@ -28944,6 +31721,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)); @@ -28970,6 +31782,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));