X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0085ce493764aeb971cb312126cf46184fcc6916..9f93b45e59e93e17850bbc37a8960240072bc1c0:/wxPython/src/gtk/_controls_wrap.cpp diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index c28a7bcd84..d36aab5736 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -2807,23 +2807,56 @@ SWIG_AsVal_bool (PyObject *obj, bool *val) static const wxString wxPyStaticTextNameStr(wxStaticTextNameStr); #include - static const wxString wxPyListBoxNameStr(wxListBoxNameStr); SWIGINTERN void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObject *clientData=NULL){ - if (clientData) { + if (clientData) + { wxPyClientData* data = new wxPyClientData(clientData); self->Insert(item, pos, data); - } else + } + else self->Insert(item, pos); } + +SWIGINTERN int +SWIG_AsVal_unsigned_SS_long (PyObject* obj, unsigned long* val) +{ + long v = 0; + if (SWIG_AsVal_long(obj, &v) && v < 0) { + return SWIG_TypeError; + } + else if (val) + *val = (unsigned long)v; + return SWIG_OK; +} + + +SWIGINTERN int +SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val) +{ + unsigned long v; + int res = SWIG_AsVal_unsigned_SS_long (obj, &v); + if (SWIG_IsOK(res)) { + if ((v > UINT_MAX)) { + return SWIG_OverflowError; + } else { + if (val) *val = static_cast< unsigned int >(v); + } + } + return res; +} + SWIGINTERN PyObject *wxListBox_GetSelections(wxListBox *self){ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxArrayInt lst; self->GetSelections(lst); PyObject *tup = PyTuple_New(lst.GetCount()); - for(size_t i=0; iAppendText(text); } @@ -2869,9 +2889,28 @@ SWIGINTERN wxString wxTextCtrl_GetString(wxTextCtrl *self,long from,long to){ static const wxString wxPySpinCtrlNameStr(_T("wxSpinCtrl")); static const wxString wxPyRadioBoxNameStr(wxRadioBoxNameStr); static const wxString wxPyRadioButtonNameStr(wxRadioButtonNameStr); -SWIGINTERN int wxRadioBox_GetColumnCount(wxRadioBox const *self){ return -1; } -SWIGINTERN int wxRadioBox_GetRowCount(wxRadioBox const *self){ return -1; } -SWIGINTERN int wxRadioBox_GetNextItem(wxRadioBox const *self,int item,wxDirection dir,long style){ return -1; } + +SWIGINTERNINLINE PyObject* +SWIG_From_unsigned_SS_long (unsigned long value) +{ + return (value > LONG_MAX) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); +} + + +SWIGINTERNINLINE PyObject * +SWIG_From_size_t (size_t value) +{ + return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); +} + + +SWIGINTERNINLINE PyObject * +SWIG_From_unsigned_SS_int (unsigned int value) +{ + return SWIG_From_unsigned_SS_long (value); +} + #include @@ -2899,21 +2938,6 @@ public: static const wxString wxPyNotebookNameStr(wxNotebookNameStr); -SWIGINTERNINLINE PyObject* -SWIG_From_unsigned_SS_long (unsigned long value) -{ - return (value > LONG_MAX) ? - PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); -} - - -SWIGINTERNINLINE PyObject * -SWIG_From_size_t (size_t value) -{ - return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); -} - - SWIGINTERNINLINE int SWIG_AsVal_size_t (PyObject * obj, size_t *val) { @@ -2923,29 +2947,6 @@ SWIG_AsVal_size_t (PyObject * obj, size_t *val) return res; } - -SWIGINTERNINLINE PyObject * -SWIG_From_unsigned_SS_int (unsigned int value) -{ - return SWIG_From_unsigned_SS_long (value); -} - - -SWIGINTERN int -SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val) -{ - unsigned long v; - int res = SWIG_AsVal_unsigned_SS_long (obj, &v); - if (SWIG_IsOK(res)) { - if ((v > UINT_MAX)) { - return SWIG_OverflowError; - } else { - if (val) *val = static_cast< unsigned int >(v); - } - } - return res; -} - static const wxString wxPyToolBarNameStr(wxToolBarNameStr); SWIGINTERN PyObject *wxToolBarToolBase_GetClientData(wxToolBarToolBase *self){ wxPyUserData* udata = (wxPyUserData*)self->GetClientData(); @@ -6277,6 +6278,60 @@ fail: } +SWIGINTERN PyObject *_wrap_ComboBox_SetString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxComboBox *arg1 = (wxComboBox *) 0 ; + int arg2 ; + wxString *arg3 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + bool temp3 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "n",(char *) "string", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_SetString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxComboBox, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ComboBox_SetString" "', expected argument " "1"" of type '" "wxComboBox *""'"); + } + arg1 = reinterpret_cast< wxComboBox * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ComboBox_SetString" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetString(arg2,(wxString const &)*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + { + if (temp3) + delete arg3; + } + return resultobj; +fail: + { + if (temp3) + delete arg3; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_ComboBox_SetEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxComboBox *arg1 = (wxComboBox *) 0 ; @@ -9091,11 +9146,11 @@ SWIGINTERN PyObject *_wrap_ListBox_InsertItems(PyObject *SWIGUNUSEDPARM(self), P PyObject *resultobj = 0; wxListBox *arg1 = (wxListBox *) 0 ; wxArrayString *arg2 = 0 ; - int arg3 ; + unsigned int arg3 ; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; - int val3 ; + unsigned int val3 ; int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -9127,11 +9182,11 @@ SWIGINTERN PyObject *_wrap_ListBox_InsertItems(PyObject *SWIGUNUSEDPARM(self), P Py_DECREF(item); } } - ecode3 = SWIG_AsVal_int(obj2, &val3); + ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ListBox_InsertItems" "', expected argument " "3"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ListBox_InsertItems" "', expected argument " "3"" of type '" "unsigned int""'"); } - arg3 = static_cast< int >(val3); + arg3 = static_cast< unsigned int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->InsertItems((wxArrayString const &)*arg2,arg3); @@ -10220,11 +10275,11 @@ fail: SWIGINTERN PyObject *_wrap_CheckListBox_IsChecked(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxCheckListBox *arg1 = (wxCheckListBox *) 0 ; - int arg2 ; + unsigned int arg2 ; bool result; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; + unsigned int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10238,11 +10293,11 @@ SWIGINTERN PyObject *_wrap_CheckListBox_IsChecked(PyObject *SWIGUNUSEDPARM(self) SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CheckListBox_IsChecked" "', expected argument " "1"" of type '" "wxCheckListBox *""'"); } arg1 = reinterpret_cast< wxCheckListBox * >(argp1); - ecode2 = SWIG_AsVal_int(obj1, &val2); + ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CheckListBox_IsChecked" "', expected argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CheckListBox_IsChecked" "', expected argument " "2"" of type '" "unsigned int""'"); } - arg2 = static_cast< int >(val2); + arg2 = static_cast< unsigned int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->IsChecked(arg2); @@ -10261,11 +10316,11 @@ fail: SWIGINTERN PyObject *_wrap_CheckListBox_Check(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxCheckListBox *arg1 = (wxCheckListBox *) 0 ; - int arg2 ; + unsigned int arg2 ; int arg3 = (int) true ; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; + unsigned int val2 ; int ecode2 = 0 ; int val3 ; int ecode3 = 0 ; @@ -10282,11 +10337,11 @@ SWIGINTERN PyObject *_wrap_CheckListBox_Check(PyObject *SWIGUNUSEDPARM(self), Py SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CheckListBox_Check" "', expected argument " "1"" of type '" "wxCheckListBox *""'"); } arg1 = reinterpret_cast< wxCheckListBox * >(argp1); - ecode2 = SWIG_AsVal_int(obj1, &val2); + ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CheckListBox_Check" "', expected argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CheckListBox_Check" "', expected argument " "2"" of type '" "unsigned int""'"); } - arg2 = static_cast< int >(val2); + arg2 = static_cast< unsigned int >(val2); if (obj2) { ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { @@ -16249,7 +16304,7 @@ fail: SWIGINTERN PyObject *_wrap_RadioBox_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxRadioBox *arg1 = (wxRadioBox *) 0 ; - int result; + size_t result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -16263,11 +16318,11 @@ SWIGINTERN PyObject *_wrap_RadioBox_GetCount(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< wxRadioBox * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxRadioBox const *)arg1)->GetCount(); + result = (size_t)((wxRadioBox const *)arg1)->GetCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_From_size_t(static_cast< size_t >(result)); return resultobj; fail: return NULL; @@ -16422,11 +16477,11 @@ fail: SWIGINTERN PyObject *_wrap_RadioBox_EnableItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRadioBox *arg1 = (wxRadioBox *) 0 ; - int arg2 ; + unsigned int arg2 ; bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; + unsigned int val2 ; int ecode2 = 0 ; bool val3 ; int ecode3 = 0 ; @@ -16443,11 +16498,11 @@ SWIGINTERN PyObject *_wrap_RadioBox_EnableItem(PyObject *SWIGUNUSEDPARM(self), P SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RadioBox_EnableItem" "', expected argument " "1"" of type '" "wxRadioBox *""'"); } arg1 = reinterpret_cast< wxRadioBox * >(argp1); - ecode2 = SWIG_AsVal_int(obj1, &val2); + ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_EnableItem" "', expected argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_EnableItem" "', expected argument " "2"" of type '" "unsigned int""'"); } - arg2 = static_cast< int >(val2); + arg2 = static_cast< unsigned int >(val2); if (obj2) { ecode3 = SWIG_AsVal_bool(obj2, &val3); if (!SWIG_IsOK(ecode3)) { @@ -16471,11 +16526,11 @@ fail: SWIGINTERN PyObject *_wrap_RadioBox_ShowItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRadioBox *arg1 = (wxRadioBox *) 0 ; - int arg2 ; + unsigned int arg2 ; bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; + unsigned int val2 ; int ecode2 = 0 ; bool val3 ; int ecode3 = 0 ; @@ -16492,11 +16547,11 @@ SWIGINTERN PyObject *_wrap_RadioBox_ShowItem(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RadioBox_ShowItem" "', expected argument " "1"" of type '" "wxRadioBox *""'"); } arg1 = reinterpret_cast< wxRadioBox * >(argp1); - ecode2 = SWIG_AsVal_int(obj1, &val2); + ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_ShowItem" "', expected argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_ShowItem" "', expected argument " "2"" of type '" "unsigned int""'"); } - arg2 = static_cast< int >(val2); + arg2 = static_cast< unsigned int >(val2); if (obj2) { ecode3 = SWIG_AsVal_bool(obj2, &val3); if (!SWIG_IsOK(ecode3)) { @@ -16517,10 +16572,92 @@ fail: } +SWIGINTERN PyObject *_wrap_RadioBox_IsItemEnabled(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRadioBox *arg1 = (wxRadioBox *) 0 ; + unsigned int arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + unsigned int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "n", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_IsItemEnabled",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRadioBox, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RadioBox_IsItemEnabled" "', expected argument " "1"" of type '" "wxRadioBox const *""'"); + } + arg1 = reinterpret_cast< wxRadioBox * >(argp1); + ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_IsItemEnabled" "', expected argument " "2"" of type '" "unsigned int""'"); + } + arg2 = static_cast< unsigned int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxRadioBox const *)arg1)->IsItemEnabled(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_RadioBox_IsItemShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRadioBox *arg1 = (wxRadioBox *) 0 ; + unsigned int arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + unsigned int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "n", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_IsItemShown",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRadioBox, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RadioBox_IsItemShown" "', expected argument " "1"" of type '" "wxRadioBox const *""'"); + } + arg1 = reinterpret_cast< wxRadioBox * >(argp1); + ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_IsItemShown" "', expected argument " "2"" of type '" "unsigned int""'"); + } + arg2 = static_cast< unsigned int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxRadioBox const *)arg1)->IsItemShown(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RadioBox_GetColumnCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxRadioBox *arg1 = (wxRadioBox *) 0 ; - int result; + unsigned int result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -16534,11 +16671,11 @@ SWIGINTERN PyObject *_wrap_RadioBox_GetColumnCount(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< wxRadioBox * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)wxRadioBox_GetColumnCount((wxRadioBox const *)arg1); + result = (unsigned int)((wxRadioBox const *)arg1)->GetColumnCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; fail: return NULL; @@ -16548,7 +16685,7 @@ fail: SWIGINTERN PyObject *_wrap_RadioBox_GetRowCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxRadioBox *arg1 = (wxRadioBox *) 0 ; - int result; + unsigned int result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -16562,11 +16699,11 @@ SWIGINTERN PyObject *_wrap_RadioBox_GetRowCount(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< wxRadioBox * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)wxRadioBox_GetRowCount((wxRadioBox const *)arg1); + result = (unsigned int)((wxRadioBox const *)arg1)->GetRowCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; fail: return NULL; @@ -16619,7 +16756,7 @@ SWIGINTERN PyObject *_wrap_RadioBox_GetNextItem(PyObject *SWIGUNUSEDPARM(self), arg4 = static_cast< long >(val4); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)wxRadioBox_GetNextItem((wxRadioBox const *)arg1,arg2,arg3,arg4); + result = (int)((wxRadioBox const *)arg1)->GetNextItem(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -19179,6 +19316,72 @@ fail: } +SWIGINTERN PyObject *_wrap_BookCtrlBase_SetControlMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "margin", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetControlMargin",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetControlMargin" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); + } + arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetControlMargin" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetControlMargin(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BookCtrlBase_GetControlMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_GetControlMargin" "', expected argument " "1"" of type '" "wxBookCtrlBase const *""'"); + } + arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxBookCtrlBase const *)arg1)->GetControlMargin(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_BookCtrlBase_SetFitToCurrentPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; @@ -19247,6 +19450,36 @@ fail: } +SWIGINTERN PyObject *_wrap_BookCtrlBase_GetControlSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + wxSizer *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_GetControlSizer" "', expected argument " "1"" of type '" "wxBookCtrlBase const *""'"); + } + arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizer *)((wxBookCtrlBase const *)arg1)->GetControlSizer(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; @@ -25180,56 +25413,6 @@ fail: } -SWIGINTERN PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxToolBar *arg1 = (wxToolBar *) 0 ; - int arg2 ; - int arg3 ; - wxToolBarToolBase *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int val2 ; - int ecode2 = 0 ; - int val3 ; - int ecode3 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "x",(char *) "y", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "1"" of type '" "wxToolBar *""'"); - } - arg1 = reinterpret_cast< wxToolBar * >(argp1); - ecode2 = SWIG_AsVal_int(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "2"" of type '" "int""'"); - } - arg2 = static_cast< int >(val2); - ecode3 = SWIG_AsVal_int(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "3"" of type '" "int""'"); - } - arg3 = static_cast< int >(val3); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxToolBarToolBase *)(arg1)->FindToolForPosition(arg2,arg3); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = wxPyMake_wxObject(result, (bool)0); - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -33184,7 +33367,7 @@ fail: SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ; - size_t result; + unsigned int result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -33198,11 +33381,11 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< wxPyTreeCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (size_t)((wxPyTreeCtrl const *)arg1)->GetCount(); + result = (unsigned int)((wxPyTreeCtrl const *)arg1)->GetCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); + resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; fail: return NULL; @@ -38872,6 +39055,34 @@ SWIGINTERN PyObject *ContextHelpButton_swiginit(PyObject *SWIGUNUSEDPARM(self), return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_delete_HelpProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHelpProvider *arg1 = (wxHelpProvider *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHelpProvider, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HelpProvider" "', expected argument " "1"" of type '" "wxHelpProvider *""'"); + } + arg1 = reinterpret_cast< wxHelpProvider * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_HelpProvider_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxHelpProvider *arg1 = (wxHelpProvider *) 0 ; @@ -40553,6 +40764,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ComboBox_GetMark", (PyCFunction)_wrap_ComboBox_GetMark, METH_O, NULL}, { (char *)"ComboBox_GetCurrentSelection", (PyCFunction)_wrap_ComboBox_GetCurrentSelection, METH_O, NULL}, { (char *)"ComboBox_SetStringSelection", (PyCFunction) _wrap_ComboBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ComboBox_SetString", (PyCFunction) _wrap_ComboBox_SetString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ComboBox_SetEditable", (PyCFunction) _wrap_ComboBox_SetEditable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ComboBox_SetInsertionPointEnd", (PyCFunction)_wrap_ComboBox_SetInsertionPointEnd, METH_O, NULL}, { (char *)"ComboBox_Remove", (PyCFunction) _wrap_ComboBox_Remove, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -40798,6 +41010,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"RadioBox_SetString", (PyCFunction) _wrap_RadioBox_SetString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RadioBox_EnableItem", (PyCFunction) _wrap_RadioBox_EnableItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RadioBox_ShowItem", (PyCFunction) _wrap_RadioBox_ShowItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RadioBox_IsItemEnabled", (PyCFunction) _wrap_RadioBox_IsItemEnabled, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RadioBox_IsItemShown", (PyCFunction) _wrap_RadioBox_IsItemShown, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RadioBox_GetColumnCount", (PyCFunction)_wrap_RadioBox_GetColumnCount, METH_O, NULL}, { (char *)"RadioBox_GetRowCount", (PyCFunction)_wrap_RadioBox_GetRowCount, METH_O, NULL}, { (char *)"RadioBox_GetNextItem", (PyCFunction) _wrap_RadioBox_GetNextItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -40863,8 +41077,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction)_wrap_BookCtrlBase_GetInternalBorder, METH_O, NULL}, { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_IsVertical", (PyCFunction)_wrap_BookCtrlBase_IsVertical, METH_O, NULL}, + { (char *)"BookCtrlBase_SetControlMargin", (PyCFunction) _wrap_BookCtrlBase_SetControlMargin, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_GetControlMargin", (PyCFunction)_wrap_BookCtrlBase_GetControlMargin, METH_O, NULL}, { (char *)"BookCtrlBase_SetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_SetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_GetFitToCurrentPage", (PyCFunction)_wrap_BookCtrlBase_GetFitToCurrentPage, METH_O, NULL}, + { (char *)"BookCtrlBase_GetControlSizer", (PyCFunction)_wrap_BookCtrlBase_GetControlSizer, METH_O, NULL}, { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction)_wrap_BookCtrlBase_DeleteAllPages, METH_O, NULL}, @@ -41017,7 +41234,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL}, { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ToolBar_FindToolForPosition", (PyCFunction) _wrap_ToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL}, { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL}, @@ -41381,6 +41597,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_ContextHelpButton", (PyCFunction) _wrap_new_ContextHelpButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ContextHelpButton_swigregister", ContextHelpButton_swigregister, METH_VARARGS, NULL}, { (char *)"ContextHelpButton_swiginit", ContextHelpButton_swiginit, METH_VARARGS, NULL}, + { (char *)"delete_HelpProvider", (PyCFunction)_wrap_delete_HelpProvider, METH_O, NULL}, { (char *)"HelpProvider_Set", (PyCFunction) _wrap_HelpProvider_Set, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HelpProvider_Get", (PyCFunction)_wrap_HelpProvider_Get, METH_NOARGS, NULL}, { (char *)"HelpProvider_GetHelp", (PyCFunction) _wrap_HelpProvider_GetHelp, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -43667,7 +43884,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "GA_HORIZONTAL",SWIG_From_int(static_cast< int >(wxGA_HORIZONTAL))); SWIG_Python_SetConstant(d, "GA_VERTICAL",SWIG_From_int(static_cast< int >(wxGA_VERTICAL))); SWIG_Python_SetConstant(d, "GA_SMOOTH",SWIG_From_int(static_cast< int >(wxGA_SMOOTH))); - SWIG_Python_SetConstant(d, "GA_PROGRESSBAR",SWIG_From_int(static_cast< int >(wxGA_PROGRESSBAR))); SWIG_addvarlink(SWIG_globals(),(char*)"StaticBitmapNameStr",StaticBitmapNameStr_get, StaticBitmapNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set); @@ -43691,7 +43907,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "TE_CHARWRAP",SWIG_From_int(static_cast< int >(wxTE_CHARWRAP))); SWIG_Python_SetConstant(d, "TE_WORDWRAP",SWIG_From_int(static_cast< int >(wxTE_WORDWRAP))); SWIG_Python_SetConstant(d, "TE_BESTWRAP",SWIG_From_int(static_cast< int >(wxTE_BESTWRAP))); - SWIG_Python_SetConstant(d, "TE_LINEWRAP",SWIG_From_int(static_cast< int >(wxTE_LINEWRAP))); SWIG_Python_SetConstant(d, "TE_RICH2",SWIG_From_int(static_cast< int >(wxTE_RICH2))); SWIG_Python_SetConstant(d, "TE_CAPITALIZE",SWIG_From_int(static_cast< int >(wxTE_CAPITALIZE))); SWIG_Python_SetConstant(d, "TEXT_ALIGNMENT_DEFAULT",SWIG_From_int(static_cast< int >(wxTEXT_ALIGNMENT_DEFAULT))); @@ -43755,6 +43970,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "BK_LEFT",SWIG_From_int(static_cast< int >(wxBK_LEFT))); SWIG_Python_SetConstant(d, "BK_RIGHT",SWIG_From_int(static_cast< int >(wxBK_RIGHT))); SWIG_Python_SetConstant(d, "BK_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxBK_ALIGN_MASK))); + SWIG_Python_SetConstant(d, "BK_BUTTONBAR",SWIG_From_int(static_cast< int >(wxBK_BUTTONBAR))); SWIG_Python_SetConstant(d, "NB_FIXEDWIDTH",SWIG_From_int(static_cast< int >(wxNB_FIXEDWIDTH))); SWIG_Python_SetConstant(d, "NB_TOP",SWIG_From_int(static_cast< int >(wxNB_TOP))); SWIG_Python_SetConstant(d, "NB_LEFT",SWIG_From_int(static_cast< int >(wxNB_LEFT))); @@ -43912,8 +44128,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "TR_FULL_ROW_HIGHLIGHT",SWIG_From_int(static_cast< int >(wxTR_FULL_ROW_HIGHLIGHT))); SWIG_Python_SetConstant(d, "TR_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxTR_DEFAULT_STYLE))); SWIG_Python_SetConstant(d, "TR_TWIST_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_TWIST_BUTTONS))); - SWIG_Python_SetConstant(d, "TR_MAC_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_MAC_BUTTONS))); - SWIG_Python_SetConstant(d, "TR_AQUA_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_AQUA_BUTTONS))); SWIG_Python_SetConstant(d, "TreeItemIcon_Normal",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Normal))); SWIG_Python_SetConstant(d, "TreeItemIcon_Selected",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Selected))); SWIG_Python_SetConstant(d, "TreeItemIcon_Expanded",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Expanded)));